Auto merge of #29273 - Manishearth:regression, r=alexcrichton

None

src/test/compile-fail/issue-26886.rs

@@ -0,0 +1,17 @@
+// Copyright 2015 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.
+
+use std::sync::{self, Arc}; //~ NOTE previous import
+                            //~^ NOTE previous import
+use std::sync::Arc; //~ ERROR a type named
+use std::sync; //~ ERROR a module named
+
+fn main() {
+}