---

yaml
---
r: 138396
b: refs/heads/master
c: 2130f22
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4765bb9cb87bcac5fecc0f02cea5dc0eca1c347d
+refs/heads/master: 2130f2221600f03129df95f3611444468806b237
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5

trunk/mk/rt.mk

@@ -284,16 +284,15 @@ endif
 # ./configure script. This is done to force libbacktrace to *not* use the
 # atomic/sync functionality because it pulls in unnecessary dependencies and we
 # never use it anyway.
-$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: \
-		export CFLAGS:=$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) \
-				-fno-stack-protector
-$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export CC:=$$(CC_$(1))
-$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export AR:=$$(AR_$(1))
-$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export RANLIB:=$$(AR_$(1)) s
 $$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS)
+	@$$(call E, configure: libbacktrace for $(1))
 	$$(Q)rm -rf $$(BACKTRACE_BUILD_DIR_$(1))
 	$$(Q)mkdir -p $$(BACKTRACE_BUILD_DIR_$(1))
 	$$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && \
+	      CC="$$(CC_$(1))" \
+	      AR="$$(AR_$(1))" \
+	      RANLIB="$$(AR_$(1)) s" \
+	      CFLAGS="$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) -fno-stack-protector" \
 	      $(S)src/libbacktrace/configure --target=$(1) --host=$(CFG_BUILD))
 	$$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \
 	      $$(BACKTRACE_BUILD_DIR_$(1))/config.h

trunk/src/libcore/option.rs

@@ -245,7 +245,7 @@ impl<T> Option<T> {
     /// ```
     /// let mut x = Some(2u);
     /// match x.as_mut() {
-    ///     Some(&ref mut v) => *v = 42,
+    ///     Some(v) => *v = 42,
     ///     None => {},
     /// }
     /// assert_eq!(x, Some(42u));

trunk/src/librustc/lint/builtin.rs

@@ -43,7 +43,7 @@ use syntax::abi;
 use syntax::ast_map;
 use syntax::attr::AttrMetaMethods;
 use syntax::attr;
-use syntax::codemap::{Span, NO_EXPANSION};
+use syntax::codemap::Span;
 use syntax::parse::token;
 use syntax::{ast, ast_util, visit};
 use syntax::ptr::P;
@@ -1473,27 +1473,33 @@ impl LintPass for Stability {
     }
 
     fn check_expr(&mut self, cx: &Context, e: &ast::Expr) {
-        // skip if `e` is not from macro arguments
-        let skip = cx.tcx.sess.codemap().with_expn_info(e.span.expn_id, |expninfo| {
+        // first, check if the given expression was generated by a macro or not
+        // we need to go back the expn_info tree to check only the arguments
+        // of the initial macro call, not the nested ones.
+        let mut expnid = e.span.expn_id;
+        let mut is_internal = false;
+        while cx.tcx.sess.codemap().with_expn_info(expnid, |expninfo| {
             match expninfo {
                 Some(ref info) => {
-                    if info.call_site.expn_id != NO_EXPANSION ||
-                       !( e.span.lo > info.call_site.lo && e.span.hi < info.call_site.hi ) {
-                        // This code is not from the arguments,
-                        // or this macro call was generated by an other macro
-                        // We can't handle it.
-                        true
-                    } else if info.callee.span.is_none() {
-                        // We don't want to mess with compiler builtins.
-                        true
+                    // save the parent expn_id for next loop iteration
+                    expnid = info.call_site.expn_id;
+                    if info.callee.span.is_none() {
+                        // it's a compiler built-in, we *really* don't want to mess with it
+                        // so we skip it, unless it was called by a regular macro, in which case
+                        // we will handle the caller macro next turn
+                        is_internal = true;
+                        true // continue looping
                     } else {
-                        false
+                        // was this expression from the current macro arguments ?
+                        is_internal = !( e.span.lo > info.call_site.lo &&
+                                         e.span.hi < info.call_site.hi );
+                        true // continue looping
                     }
                 },
-                _ => { false }
+                _ => false // stop looping
             }
-        });
-        if skip { return; }
+        }) { /* empty while loop body */ }
+        if is_internal { return; }
 
         let mut span = e.span;
 

trunk/src/test/compile-fail/lint-stability.rs

@@ -116,6 +116,7 @@ mod cross_crate {
         // on macros themselves are not yet linted.
         macro_test!();
         macro_test_arg!(deprecated_text()); //~ ERROR use of deprecated item: text
+        macro_test_arg!(macro_test_arg!(deprecated_text())); //~ ERROR use of deprecated item: text
         macro_test_arg_nested!(deprecated_text);
     }