---

yaml
---
r: 102556
b: refs/heads/auto
c: f502576
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: c594e675eb3db25cd018d58d8fe06ef6ea2c90de
+refs/heads/auto: f502576fc7a97825ee90b01c724b63a4bd4c85aa
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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());
     }

branches/auto/src/libstd/gc.rs

@@ -35,7 +35,6 @@ pub struct Gc<T> {
 }
 
 #[cfg(test)]
-#[no_send]
 pub struct Gc<T> {
     priv ptr: @T,
     priv marker: marker::NoSend,

branches/auto/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,