---

yaml
---
r: 73277
b: refs/heads/dist-snap
c: 84233c0
h: refs/heads/master
i:
  73275: 953a374
v: v3

Author: bors

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: eb3f47a40a5578f50a9071b430ad95840640a344
+refs/heads/dist-snap: 84233c0b4b777deb1c826e704f737959c991af54
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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/dist-snap/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);
 

branches/dist-snap/src/libstd/fileinput.rs

@@ -210,7 +210,9 @@ impl FileInput {
     pub fn next_file(&self) -> bool {
         // No more files
 
-        if self.fi.files.is_empty() {
+        // unsafe block can be removed after the next snapshot
+        // (next one after 2013-05-03)
+        if unsafe { self.fi.files.is_empty() } {
             self.fi.current_reader = None;
             return false;
         }
@@ -322,7 +324,9 @@ impl io::Reader for FileInput {
     fn eof(&self) -> bool {
         // we've run out of files, and current_reader is either None or eof.
 
-        self.fi.files.is_empty() &&
+        // unsafe block can be removed after the next snapshot
+        // (next one after 2013-05-03)
+        (unsafe { self.fi.files.is_empty() }) &&
             match self.fi.current_reader { None => true, Some(r) => r.eof() }
 
     }