More test fixes and rebase conflicts

2015-01-21 11:56:52 -08:00 · 2015-01-21 11:56:52 -08:00 · ecbee2e568
commit ecbee2e568
parent df1cddf20a
4 changed files with 3 additions and 3 deletions
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@ -11,6 +11,7 @@
 #![allow(non_snake_case)]

 register_diagnostics! {
+    E0154,
    E0157,
    E0153,
    E0251, // a named type or value has already been imported in this module