auto merge of #12822 : erickt/rust/cleanup, r=acrichto

This PR makes `std::io::FileStat` hashable, and `Path` serializable as a byte array.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs
index 299989d5fe6..a94feee9d37 100644
--- a/src/libsyntax/ext/deriving/hash.rs
+++ b/src/libsyntax/ext/deriving/hash.rs
@@ -24,12 +24,12 @@ pub fn expand_deriving_hash(cx: &mut ExtCtxt,
 
     let (path, generics, args) = if cx.ecfg.deriving_hash_type_parameter {
         (Path::new_(vec!("std", "hash", "Hash"), None,
-                    vec!(~Literal(Path::new_local("__H"))), true),
+                    vec!(~Literal(Path::new_local("__S"))), true),
          LifetimeBounds {
              lifetimes: Vec::new(),
-             bounds: vec!(("__H", vec!(Path::new(vec!("std", "io", "Writer"))))),
+             bounds: vec!(("__S", vec!(Path::new(vec!("std", "io", "Writer"))))),
          },
-         Path::new_local("__H"))
+         Path::new_local("__S"))
     } else {
         (Path::new(vec!("std", "hash", "Hash")),
          LifetimeBounds::empty(),