Compilation fixes

src/Cargo.lock

@@ -201,7 +201,6 @@ dependencies = [
 name = "proc_macro"
 version = "0.0.0"
 dependencies = [
- "rustc_i128 0.0.0",
  "syntax 0.0.0",
 ]
 
@@ -388,6 +387,7 @@ dependencies = [
  "log 0.0.0",
  "rustc 0.0.0",
  "rustc_data_structures 0.0.0",
+ "rustc_i128 0.0.0",
  "serialize 0.0.0",
  "syntax 0.0.0",
  "syntax_pos 0.0.0",

src/librustc_incremental/Cargo.toml

@@ -16,3 +16,4 @@ serialize = { path = "../libserialize" }
 log = { path = "../liblog" }
 syntax = { path = "../libsyntax" }
 syntax_pos = { path = "../libsyntax_pos" }
+rustc_i128 = { path = "../librustc_i128" }

src/librustc_incremental/lib.rs

@@ -33,6 +33,8 @@
 #[macro_use] extern crate syntax;
 extern crate syntax_pos;
 
+extern crate rustc_i128;
+
 const ATTR_DIRTY: &'static str = "rustc_dirty";
 const ATTR_CLEAN: &'static str = "rustc_clean";
 const ATTR_DIRTY_METADATA: &'static str = "rustc_metadata_dirty";

src/librustdoc/clean/mod.rs

@@ -1614,7 +1614,7 @@ fn from_str(s: &str) -> Option<PrimitiveType> {
     }
 
     pub fn as_str(&self) -> &'static str {
-        use PrimitiveType::*;
+        use self::PrimitiveType::*;
         match *self {
             Isize => "isize",
             I8 => "i8",