---

yaml
---
r: 129703
b: refs/heads/master
c: 6bbec28
h: refs/heads/master
i:
  129701: 1c81042
  129699: a994623
  129695: a71d074
v: v3

Author: bkoropoff

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a40e2a6463f972f687ab7e3636ba8c5595d9877c
+refs/heads/master: 6bbec28ea0193b09dbdfc2669b94ec7603506d21
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 602592675ce86aeca465c4ac748cee2bff291443
 refs/heads/try: 55c1a67fa1eb621bb8e73e0b13af2823391eb1be

trunk/src/test/compile-fail/resolve-conflict-type-vs-import.rs

@@ -0,0 +1,18 @@
+// 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.
+
+use std::slice::Items;
+//~^ ERROR import `Items` conflicts with type in this module
+
+struct Items;
+
+fn main() {
+}
+