Make newtype_index macro use full path to resolve constants

2 files changed, 3 insertions, 5 deletions

diff --git a/src/librustc_data_structures/indexed_vec.rs b/src/librustc_data_structures/indexed_vec.rs
index 7674018075c..01fb2930687 100644
--- a/src/librustc_data_structures/indexed_vec.rs
+++ b/src/librustc_data_structures/indexed_vec.rs
@@ -47,7 +47,7 @@ macro_rules! newtype_index {
 
         impl Idx for $name {
             fn new(value: usize) -> Self {
-                assert!(value < (u32::MAX) as usize);
+                assert!(value < (::std::u32::MAX) as usize);
                 $name(value as u32)
             }
             fn index(self) -> usize {
@@ -55,8 +55,8 @@ macro_rules! newtype_index {
             }
         }
 
-        impl Debug for $name {
-            fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
+        impl ::std::fmt::Debug for $name {
+            fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
                 write!(fmt, "{}{}", $debug_name, self.0)
             }
         }
diff --git a/src/librustc_mir/transform/nll/mod.rs b/src/librustc_mir/transform/nll/mod.rs
index c6acc53f5fa..7ef8e3bdbd5 100644
--- a/src/librustc_mir/transform/nll/mod.rs
+++ b/src/librustc_mir/transform/nll/mod.rs
@@ -19,8 +19,6 @@ use rustc::util::nodemap::FxHashSet;
 use rustc_data_structures::indexed_vec::{IndexVec, Idx};
 use syntax_pos::DUMMY_SP;
 use std::collections::HashMap;
-use std::fmt::{self, Debug, Formatter};
-use std::u32;
 
 #[allow(dead_code)]
 struct NLLVisitor<'a, 'gcx: 'a + 'tcx, 'tcx: 'a> {