Move Rejection alongside the types that use it.

Author: AltSysrq

CHANGELOG.md

@@ -11,7 +11,7 @@
 
 ### New Additions
 
-- Added `proptest::strategy::Rejection` which allows you to avoid heap
+- Added `proptest::test_runner::Rejection` which allows you to avoid heap
   allocation in some places or share allocation with string-interning.
 
 - Added a type alias `proptest::strategy::NewTree<S>` where `S: Strategy`

src/strategy/filter.rs

@@ -11,7 +11,6 @@ use std::fmt;
 use std::sync::Arc;
 
 use strategy::traits::*;
-use strategy::rejection::Rejection;
 use test_runner::*;
 
 /// `Strategy` and `ValueTree` filter adaptor.

src/strategy/flatten.rs

@@ -13,7 +13,6 @@ use std::sync::Arc;
 
 use strategy::fuse::Fuse;
 use strategy::traits::*;
-use strategy::Rejection;
 use test_runner::*;
 
 /// Adaptor that flattens a `Strategy` which produces other `Strategy`s into a

src/strategy/mod.rs

@@ -9,7 +9,6 @@
 
 //! Defines the core traits used by Proptest.
 
-mod rejection;
 mod traits;
 mod map;
 mod filter;
@@ -19,7 +18,6 @@ mod recursive;
 mod shuffle;
 mod fuse;
 
-pub use self::rejection::*;
 pub use self::traits::*;
 pub use self::map::*;
 pub use self::filter::*;

src/strategy/rejection.rs

@@ -27,7 +27,6 @@
 use std::fmt;
 
 use strategy::traits::*;
-use strategy::Rejection;
 use test_runner::*;
 
 /// Essentially `Fn (&T) -> bool`.

src/strategy/statics.rs

@@ -1,5 +1,5 @@
 //-
-// Copyright 2017, 2018 Jason Lingle
+// Copyright 2017, 2018 The proptest developers
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -12,13 +12,14 @@
 //! You do not normally need to access things in this module directly except
 //! when implementing new low-level strategies.
 
-use std::borrow::Cow;
+use std::borrow::{Borrow, Cow};
 use std::collections::BTreeMap;
 use std::env;
 use std::ffi::OsString;
 use std::fmt;
 use std::fs;
 use std::io::{self, BufRead, Write};
+use std::ops;
 use std::panic::{self, AssertUnwindSafe};
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};
@@ -284,6 +285,47 @@ impl FailurePersistence {
     }
 }
 
+/// The reason for why something, such as a generated value, was rejected.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Rejection(Cow<'static, str>);
+
+impl From<&'static str> for Rejection {
+    fn from(s: &'static str) -> Self {
+        Rejection(s.into())
+    }
+}
+
+impl From<String> for Rejection {
+    fn from(s: String) -> Self {
+        Rejection(s.into())
+    }
+}
+
+impl From<Box<str>> for Rejection {
+    fn from(s: Box<str>) -> Self {
+        Rejection(String::from(s).into())
+    }
+}
+
+impl ops::Deref for Rejection {
+    type Target = str;
+    fn deref(&self) -> &Self::Target { self.0.deref() }
+}
+
+impl AsRef<str> for Rejection {
+    fn as_ref(&self) -> &str { &*self }
+}
+
+impl Borrow<str> for Rejection {
+    fn borrow(&self) -> &str { &*self }
+}
+
+impl fmt::Display for Rejection {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Display::fmt(self.as_ref(), f)
+    }
+}
+
 /// Errors which can be returned from test cases to indicate non-successful
 /// completion.
 ///