---

yaml
---
r: 42066
b: refs/heads/master
c: db6af50
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a72aeef9f7f1baa059e26c9eb35204aa65bafb7d
+refs/heads/master: db6af50d533527e77a73630c16138c1c5864d58e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/middle/ty.rs

@@ -418,6 +418,7 @@ type ctxt =
       mut next_id: uint,
       vecs_implicitly_copyable: bool,
       legacy_modes: bool,
+      legacy_records: bool,
       cstore: metadata::cstore::CStore,
       sess: session::Session,
       def_map: resolve::DefMap,
@@ -984,11 +985,16 @@ fn mk_ctxt(s: session::Session,
            +lang_items: middle::lang_items::LanguageItems,
            crate: @ast::crate) -> ctxt {
     let mut legacy_modes = false;
+    let mut legacy_records = false;
     for crate.node.attrs.each |attribute| {
         match attribute.node.value.node {
             ast::meta_word(ref w) if (*w) == ~"legacy_modes" => {
                 legacy_modes = true;
-                break;
+                if legacy_records { break; }
+            }
+            ast::meta_word(ref w) if (*w) == ~"legacy_records" => {
+                legacy_records = true;
+                if legacy_modes { break; }
             }
             _ => {}
         }
@@ -1003,6 +1009,7 @@ fn mk_ctxt(s: session::Session,
       mut next_id: 0u,
       vecs_implicitly_copyable: vecs_implicitly_copyable,
       legacy_modes: legacy_modes,
+      legacy_records: legacy_records,
       cstore: s.cstore,
       sess: s,
       def_map: dm,