---

yaml
---
r: 151109
b: refs/heads/try2
c: 6648651
h: refs/heads/master
i:
  151107: 4a10260
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6328f7c199a1697aaee7e5fe2b397c457e6c311a
+refs/heads/try2: 66486518d5e1e4f0850024386b66a7aa790fc32f
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/lint.rs

@@ -1638,6 +1638,9 @@ impl<'a> Visitor<()> for Context<'a> {
     fn visit_view_item(&mut self, i: &ast::ViewItem, _: ()) {
         self.with_lint_attrs(i.attrs.as_slice(), |cx| {
             check_attrs_usage(cx, i.attrs.as_slice());
+
+            cx.visit_ids(|v| v.visit_view_item(i, ()));
+
             visit::walk_view_item(cx, i, ());
         })
     }

branches/try2/src/libstd/lib.rs

@@ -57,8 +57,6 @@
 // Don't link to std. We are std.
 #![no_std]
 
-// NOTE: remove after snapshot
-#![allow(unknown_features)]
 #![deny(missing_doc)]
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print

branches/try2/src/libsyntax/ast_util.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -396,6 +396,13 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
     }
 
     fn visit_view_item(&mut self, view_item: &ViewItem, env: ()) {
+        if !self.pass_through_items {
+            if self.visited_outermost {
+                return;
+            } else {
+                self.visited_outermost = true;
+            }
+        }
         match view_item.node {
             ViewItemExternCrate(_, _, node_id) => {
                 self.operation.visit_id(node_id)
@@ -417,7 +424,8 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
                 }
             }
         }
-        visit::walk_view_item(self, view_item, env)
+        visit::walk_view_item(self, view_item, env);
+        self.visited_outermost = false;
     }
 
     fn visit_foreign_item(&mut self, foreign_item: &ForeignItem, env: ()) {

branches/try2/src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2014-04-23 b5dd3f0
+  freebsd-x86_64 b6ccb045b9bea4cc4781bc128e047a1c68dc2c17
+  linux-i386 9e4e8d2bc70ff5b8db21169f762cb20c4dba6c2c
+  linux-x86_64 3367b8e1a0295c8124c26c5c627343ebe9a0ac5d
+  macos-i386 3029be6d6cc7a34b8a03a0a659b427c2916a8962
+  macos-x86_64 2de6d89ac8063588a37059140a602f028f2cc2ea
+  winnt-i386 021b39bc24b293f166aa329224f08cc5dedd5769
+
 S 2014-04-15 349d66a
   freebsd-x86_64 0e8078e24b3f86481c5ae0a47a15e5ed2703f241
   linux-i386 b4e5d104fc2b1eb0236b662ab3cbbb729f789bd6

branches/try2/src/test/compile-fail/lint-directives-on-use-items-issue-10534.rs

@@ -0,0 +1,33 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![deny(unused_imports)]
+
+// The aim of this test is to ensure that deny/allow/warn directives
+// are applied to individual "use" statements instead of silently
+// ignored.
+
+#[allow(dead_code)]
+mod a { pub static x: int = 3; pub static y: int = 4; }
+
+mod b {
+    use a::x; //~ ERROR: unused import
+    #[allow(unused_imports)]
+    use a::y; // no error here
+}
+
+#[allow(unused_imports)]
+mod c {
+    use a::x;
+    #[deny(unused_imports)]
+    use a::y; //~ ERROR: unused import
+}
+
+fn main() {}