---

yaml
---
r: 277499
b: refs/heads/try
c: 0649942
h: refs/heads/master
i:
  277497: 1703ece
  277495: d027410

Author: jseyfried

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: adda14a0339ff47c526d8fb6897d70fbd73a5768
+refs/heads/try: 0649942a46d29a4782b4bfcce1c6fe006ad63dc6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/README.md

@@ -16,7 +16,7 @@ Read ["Installing Rust"] from [The Book].
 
 1. Make sure you have installed the dependencies:
 
-   * `g++` 4.7 or later or `clang++` 3.x
+   * `g++` 4.7 or `clang++` 3.x
    * `python` 2.7 (but not 3.x)
    * GNU `make` 3.81 or later
    * `curl`

branches/try/configure

@@ -1453,19 +1453,6 @@ then
     cd ${CFG_BUILD_DIR}
 fi
 
-# Do a sanity check that the submodule source exists. Because GitHub
-# automatically publishes broken tarballs that can't be disabled, and
-# people download them and try to use them.
-if [ ! -e "${CFG_SRC_DIR}/src/liblibc" ]; then
-    err "some submodules are missing. Is this a broken tarball?
-
-If you downloaded this tarball from the GitHub release pages at
-https://github.com/rust-lang/rust/releases,
-then please delete it and instead download the source from
-https://www.rust-lang.org/downloads.html"
-
-fi
-
 # Configure llvm, only if necessary
 step_msg "looking at LLVM"
 CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/

branches/try/src/libcollections/btree/map.rs

@@ -1654,15 +1654,6 @@ impl<'a, K: Ord, V> Entry<'a, K, V> {
             Vacant(entry) => entry.insert(default()),
         }
     }
-
-    /// Returns a reference to this entry's key.
-    #[unstable(feature = "map_entry_keys", issue = "32281")]
-    pub fn key(&self) -> &K {
-        match *self {
-            Occupied(ref entry) => entry.key(),
-            Vacant(ref entry) => entry.key(),
-        }
-    }
 }
 
 impl<'a, K: Ord, V> VacantEntry<'a, K, V> {

branches/try/src/libcollections/btree/set.rs

@@ -477,9 +477,9 @@ impl<T: Ord> BTreeSet<T> {
 
     /// Adds a value to the set.
     ///
-    /// If the set did not have this value present, `true` is returned.
+    /// If the set did not have a value present, `true` is returned.
     ///
-    /// If the set did have this value present, `false` is returned, and the
+    /// If the set did have this key present, `false` is returned, and the
     /// entry is not updated. See the [module-level documentation] for more.
     ///
     /// [module-level documentation]: index.html#insert-and-complex-keys

branches/try/src/librustc/hir/lowering.rs

@@ -213,6 +213,8 @@ fn cache_ids<'a, OP, R>(lctx: &LoweringContext, expr_id: NodeId, op: OP) -> R
         let id_cache: &mut HashMap<_, _> = &mut lctx.id_cache.borrow_mut();
 
         if id_cache.contains_key(&expr_id) {
+            panic!("relowering!!!");
+            /*
             let cached_id = lctx.cached_id.get();
             if cached_id == 0 {
                 // We're entering a node where we need to track ids, but are not
@@ -224,6 +226,7 @@ fn cache_ids<'a, OP, R>(lctx: &LoweringContext, expr_id: NodeId, op: OP) -> R
                 assert!(cached_id == id_cache[&expr_id], "id mismatch");
             }
             lctx.gensym_key.set(id_cache[&expr_id]);
+            */
         } else {
             // We've never lowered this node before, remember it for next time.
             let next_id = lctx.id_assigner.peek_node_id();

branches/try/src/librustc_driver/driver.rs

@@ -645,6 +645,21 @@ pub fn phase_2_configure_and_expand(sess: &Session,
         ret
     });
 
+    // Needs to go *after* expansion to be able to check the results
+    // of macro expansion.  This runs before #[cfg] to try to catch as
+    // much as possible (e.g. help the programmer avoid platform
+    // specific differences)
+    time(time_passes, "complete gated feature checking 1", || {
+        sess.track_errors(|| {
+            let features = syntax::feature_gate::check_crate(sess.codemap(),
+                                                             &sess.parse_sess.span_diagnostic,
+                                                             &krate,
+                                                             &attributes,
+                                                             sess.opts.unstable_features);
+            *sess.features.borrow_mut() = features;
+        })
+    })?;
+
     // JBC: make CFG processing part of expansion to avoid this problem:
 
     // strip again, in case expansion added anything with a #[cfg].
@@ -683,8 +698,10 @@ pub fn phase_2_configure_and_expand(sess: &Session,
          "checking for inline asm in case the target doesn't support it",
          || no_asm::check_crate(sess, &krate));
 
-    // Needs to go *after* expansion to be able to check the results of macro expansion.
-    time(time_passes, "complete gated feature checking", || {
+    // One final feature gating of the true AST that gets compiled
+    // later, to make sure we've got everything (e.g. configuration
+    // can insert new attributes via `cfg_attr`)
+    time(time_passes, "complete gated feature checking 2", || {
         sess.track_errors(|| {
             let features = syntax::feature_gate::check_crate(sess.codemap(),
                                                              &sess.parse_sess.span_diagnostic,

branches/try/src/librustc_resolve/diagnostics.rs

@@ -948,51 +948,6 @@ use something_which_doesnt_exist;
 Please verify you didn't misspell the import's name.
 "##,
 
-E0434: r##"
-This error indicates that a variable usage inside an inner function is invalid
-because the variable comes from a dynamic environment. Inner functions do not
-have access to their containing environment.
-
-Example of erroneous code:
-
-```compile_fail
-fn foo() {
-    let y = 5;
-    fn bar() -> u32 {
-        y // error: can't capture dynamic environment in a fn item; use the
-          //        || { ... } closure form instead.
-    }
-}
-```
-
-Functions do not capture local variables. To fix this error, you can replace the
-function with a closure:
-
-```
-fn foo() {
-    let y = 5;
-    let bar = || {
-        y
-    };
-}
-```
-
-or replace the captured variable with a constant or a static item:
-
-```
-fn foo() {
-    static mut X: u32 = 4;
-    const Y: u32 = 5;
-    fn bar() -> u32 {
-        unsafe {
-            X = 3;
-        }
-        Y
-    }
-}
-```
-"##,
-
 E0435: r##"
 A non-constant value was used to initialise a constant. Example of erroneous
 code:
@@ -1089,4 +1044,5 @@ register_diagnostics! {
     E0421, // unresolved associated const
     E0427, // cannot use `ref` binding mode with ...
     E0429, // `self` imports are only allowed within a { } list
+    E0434, // can't capture dynamic environment in a fn item
 }

branches/try/src/libstd/collections/hash/map.rs

@@ -1533,15 +1533,6 @@ impl<'a, K, V> Entry<'a, K, V> {
             Vacant(entry) => entry.insert(default()),
         }
     }
-
-    /// Returns a reference to this entry's key.
-    #[unstable(feature = "map_entry_keys", issue = "32281")]
-    pub fn key(&self) -> &K {
-        match *self {
-            Occupied(ref entry) => entry.key(),
-            Vacant(ref entry) => entry.key(),
-        }
-    }
 }
 
 impl<'a, K, V> OccupiedEntry<'a, K, V> {

branches/try/src/libsyntax/ext/expand.rs

@@ -327,7 +327,9 @@ macro_rules! with_exts_frame {
 // When we enter a module, record it, for the sake of `module!`
 pub fn expand_item(it: P<ast::Item>, fld: &mut MacroExpander)
                    -> SmallVector<P<ast::Item>> {
-    expand_annotatable(Annotatable::Item(it), fld)
+    let it = expand_item_multi_modifier(Annotatable::Item(it), fld);
+
+    expand_annotatable(it, fld)
         .into_iter().map(|i| i.expect_item()).collect()
 }
 

branches/try/src/test/codegen-units/partitioning/extern-drop-glue.rs

@@ -9,10 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/extern-drop-glue
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/extern-generic.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=eager -Zincremental=tmp/partitioning-tests/extern-generic
+// compile-flags:-Zprint-trans-items=eager -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/inlining-from-extern-crate.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/inlining-from-extern-crate
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![crate_type="lib"]
 

branches/try/src/test/codegen-units/partitioning/local-drop-glue.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/local-drop-glue
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/local-generic.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=eager -Zincremental=tmp/partitioning-tests/local-generic
+// compile-flags:-Zprint-trans-items=eager -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/local-inlining.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/local-inlining
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/local-transitive-inlining.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/local-transitive-inlining
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/methods-are-with-self-type.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/methods-are-with-self-type
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![allow(dead_code)]
 

branches/try/src/test/codegen-units/partitioning/regular-modules.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=eager -Zincremental=tmp/partitioning-tests/regular-modules
+// compile-flags:-Zprint-trans-items=eager -Z incremental=tmp
 
 #![allow(dead_code)]
 #![crate_type="lib"]

branches/try/src/test/codegen-units/partitioning/statics.rs

@@ -9,9 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// We specify -Z incremental here because we want to test the partitioning for
-// incremental compilation
-// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp/partitioning-tests/statics
+// compile-flags:-Zprint-trans-items=lazy -Zincremental=tmp
 
 #![crate_type="lib"]