---

yaml
---
r: 102557
b: refs/heads/auto
c: e0c1707
h: refs/heads/master
i:
  102555: 9877894
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: f502576fc7a97825ee90b01c724b63a4bd4c85aa
+refs/heads/auto: e0c1707560d02bb5805b33cb17e8abfc339eb16b
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/metadata/cstore.rs

@@ -215,15 +215,7 @@ impl CStore {
             debug!("  hash[{}]: {}", x.name, x.hash);
         }
 
-        let mut hashes = ~[];
-        for ch in result.move_iter() {
-            let crate_hash {
-                hash,
-                ..
-            } = ch;
-            hashes.push(hash)
-        }
-        hashes
+        result.move_iter().map(|crate_hash { hash, ..}| hash).collect()
     }
 }
 

branches/auto/src/librustdoc/clean.rs

@@ -878,16 +878,13 @@ fn path_to_str(p: &ast::Path) -> ~str {
 
     let mut s = ~"";
     let mut first = true;
-    for i in p.segments.iter().map(|x| {
-            let string = token::get_ident(x.identifier.name);
-            string.get().to_str()
-    }) {
+    for i in p.segments.iter().map(|x| token::get_ident(x.identifier.name)) {
         if !first || p.global {
             s.push_str("::");
         } else {
             first = false;
         }
-        s.push_str(i);
+        s.push_str(i.get());
     }
     s
 }

branches/auto/src/libsyntax/parse/token.rs

@@ -554,13 +554,6 @@ pub struct InternedString {
     priv string: RcStr,
 }
 
-#[unsafe_destructor]
-impl Drop for InternedString {
-    fn drop(&mut self) {
-        // No-op just to make this not implicitly copyable.
-    }
-}
-
 impl InternedString {
     #[inline]
     pub fn new(string: &'static str) -> InternedString {