0a03825f76
Prior work, notably 6550021124 from #88316
has removed box syntax from most of the testsuite. However,
some tests were left out.
This commit removes box_syntax uses from more locations in src/test.
Some tests that are very box syntax specific are not being migrated.
59 lines
991 B
Rust
59 lines
991 B
Rust
// run-pass
|
|
|
|
struct StrWrap {
|
|
s: String
|
|
}
|
|
|
|
impl StrWrap {
|
|
fn new(s: &str) -> StrWrap {
|
|
StrWrap { s: s.to_string() }
|
|
}
|
|
|
|
fn get_s<'a>(&'a self) -> &'a str {
|
|
&self.s
|
|
}
|
|
}
|
|
|
|
struct MyStruct {
|
|
s: StrWrap
|
|
}
|
|
|
|
impl MyStruct {
|
|
fn new(s: &str) -> MyStruct {
|
|
MyStruct { s: StrWrap::new(s) }
|
|
}
|
|
|
|
fn get_str_wrap<'a>(&'a self) -> &'a StrWrap {
|
|
&self.s
|
|
}
|
|
}
|
|
|
|
trait Matcher<T> {
|
|
fn matches(&self, actual: T) -> bool;
|
|
}
|
|
|
|
fn assert_that<T, U: Matcher<T>>(actual: T, matcher: &U) {
|
|
assert!(matcher.matches(actual));
|
|
}
|
|
|
|
struct EqualTo<T> {
|
|
expected: T
|
|
}
|
|
|
|
impl<T: Eq> Matcher<T> for EqualTo<T> {
|
|
fn matches(&self, actual: T) -> bool {
|
|
self.expected.eq(&actual)
|
|
}
|
|
}
|
|
|
|
fn equal_to<T: Eq>(expected: T) -> Box<EqualTo<T>> {
|
|
Box::new(EqualTo { expected: expected })
|
|
}
|
|
|
|
pub fn main() {
|
|
let my_struct = MyStruct::new("zomg");
|
|
let s = my_struct.get_str_wrap();
|
|
|
|
assert_that(s.get_s(), &*equal_to("zomg"));
|
|
}
|