---

yaml
---
r: 277247
b: refs/heads/try
c: 1e134a4
h: refs/heads/master
i:
  277245: dbc0c03
  277243: 3dfc771
  277239: 4031b61
  277231: d960a45
  277215: 3fee18b
  277183: 961e716
  277119: 7eaf35e
  276991: 2d0dffa

Author: jseyfried

[refs]

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

branches/try/src/librustc_resolve/resolve_imports.rs

@@ -664,8 +664,8 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
         return Success(());
     }
 
-    // Miscellaneous post-processing, including recording reexports, recording shadowed traits,
-    // reporting conflicts, reporting the PRIVATE_IN_PUBLIC lint, and reporting unresolved imports.
+    // Miscellaneous post-processing, including recording reexports, reporting conflicts,
+    // reporting the PRIVATE_IN_PUBLIC lint, and reporting unresolved imports.
     fn finalize_resolutions_in(&mut self, module: Module<'b>, report_unresolved_imports: bool) {
         // Since import resolution is finished, globs will not define any more names.
         *module.globs.borrow_mut() = Vec::new();