---

yaml
---
r: 60534
b: refs/heads/auto
c: 17dfebf
h: refs/heads/master
v: v3

Author: sanxiyn

[refs]

@@ -14,6 +14,6 @@ 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: f323b0c8bac704366eb307437faea231fb73b8d1
+refs/heads/auto: 17dfebf883053ea84ef3fcf6b928d4a210c1012e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/hash.rs

@@ -76,12 +76,16 @@ pub trait Streaming {
     fn reset(&mut self);
 }
 
+fn transmute_for_stage0<'a>(bytes: &'a [u8]) -> &'a [u8] {
+    bytes
+}
+
 impl<A:IterBytes> Hash for A {
     #[inline(always)]
     fn hash_keyed(&self, k0: u64, k1: u64) -> u64 {
         let mut s = State::new(k0, k1);
         for self.iter_bytes(true) |bytes| {
-            s.input(bytes);
+            s.input(transmute_for_stage0(bytes));
         }
         s.result_u64()
     }
@@ -91,10 +95,10 @@ fn hash_keyed_2<A: IterBytes,
                 B: IterBytes>(a: &A, b: &B, k0: u64, k1: u64) -> u64 {
     let mut s = State::new(k0, k1);
     for a.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for b.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     s.result_u64()
 }
@@ -104,13 +108,13 @@ fn hash_keyed_3<A: IterBytes,
                 C: IterBytes>(a: &A, b: &B, c: &C, k0: u64, k1: u64) -> u64 {
     let mut s = State::new(k0, k1);
     for a.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for b.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for c.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     s.result_u64()
 }
@@ -128,16 +132,16 @@ fn hash_keyed_4<A: IterBytes,
                 -> u64 {
     let mut s = State::new(k0, k1);
     for a.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for b.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for c.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for d.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     s.result_u64()
 }
@@ -157,19 +161,19 @@ fn hash_keyed_5<A: IterBytes,
                 -> u64 {
     let mut s = State::new(k0, k1);
     for a.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for b.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for c.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for d.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     for e.iter_bytes(true) |bytes| {
-        s.input(bytes);
+        s.input(transmute_for_stage0(bytes));
     }
     s.result_u64()
 }

branches/auto/src/librustc/driver/driver.rs

@@ -239,7 +239,7 @@ pub fn compile_rest(sess: Session,
     let (llmod, link_meta) = {
 
         let ty_cx = ty::mk_ctxt(sess, def_map, ast_map, freevars,
-                                region_map, rp_set, lang_items, crate);
+                                region_map, rp_set, lang_items);
 
         // passes are timed inside typeck
         let (method_map, vtable_map) = typeck::check_crate(

branches/auto/src/librustc/middle/ty.rs

@@ -232,7 +232,6 @@ struct ctxt_ {
     diag: @syntax::diagnostic::span_handler,
     interner: @mut HashMap<intern_key, ~t_box_>,
     next_id: @mut uint,
-    legacy_modes: bool,
     cstore: @mut metadata::cstore::CStore,
     sess: session::Session,
     def_map: resolve::DefMap,
@@ -906,24 +905,12 @@ pub fn mk_ctxt(s: session::Session,
                freevars: freevars::freevar_map,
                region_maps: @mut middle::region::RegionMaps,
                region_paramd_items: middle::region::region_paramd_items,
-               lang_items: middle::lang_items::LanguageItems,
-               crate: @ast::crate)
+               lang_items: middle::lang_items::LanguageItems)
             -> ctxt {
-    let mut legacy_modes = false;
-    for crate.node.attrs.each |attribute| {
-        match attribute.node.value.node {
-            ast::meta_word(w) if *w == ~"legacy_modes" => {
-                legacy_modes = true;
-            }
-            _ => {}
-        }
-    }
-
     @ctxt_ {
         diag: s.diagnostic(),
         interner: @mut HashMap::new(),
         next_id: @mut primitives::LAST_PRIMITIVE_ID,
-        legacy_modes: legacy_modes,
         cstore: s.cstore,
         sess: s,
         def_map: dm,

branches/auto/src/librustc/middle/typeck/infer/test.rs

@@ -67,7 +67,7 @@ fn setup_env(test_name: &str, source_string: &str) -> Env {
         cfg, parse_sess);
 
     let tcx = ty::mk_ctxt(sess, dm, amap, freevars, region_map,
-                          region_paramd_items, lang_items, crate);
+                          region_paramd_items, lang_items);
 
     let infcx = infer::new_infer_ctxt(tcx);