From f502576fc7a97825ee90b01c724b63a4bd4c85aa Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Sun, 2 Feb 2014 02:19:55 +1100 Subject: [PATCH] Fix `@str` removal tests. --- src/librustc/driver/driver.rs | 2 +- src/libstd/gc.rs | 1 - src/libsyntax/parse/token.rs | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index 00b878a7bf74..b779c7e73b1c 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -1213,7 +1213,7 @@ mod test { let sessopts = build_session_options(~"rustc", matches, @diagnostic::DefaultEmitter); let sess = build_session(sessopts, None, @diagnostic::DefaultEmitter); let cfg = build_configuration(sess); - let mut test_items = cfg.iter().filter(|m| "test" == m.name()); + let mut test_items = cfg.iter().filter(|m| m.name().equiv(&("test"))); assert!(test_items.next().is_some()); assert!(test_items.next().is_none()); } diff --git a/src/libstd/gc.rs b/src/libstd/gc.rs index 8ec07290a316..fa7c94ac9948 100644 --- a/src/libstd/gc.rs +++ b/src/libstd/gc.rs @@ -35,7 +35,6 @@ pub struct Gc { } #[cfg(test)] -#[no_send] pub struct Gc { priv ptr: @T, priv marker: marker::NoSend, diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index fa53f021cdbd..c0abbb9222ba 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -549,7 +549,6 @@ pub fn get_ident_interner() -> @IdentInterner { /// destroyed. In particular, they must not access string contents. This can /// be fixed in the future by just leaking all strings until task death /// somehow. -#[no_send] #[deriving(Clone, Eq, IterBytes, Ord, TotalEq, TotalOrd)] pub struct InternedString { priv string: RcStr,