Rebase fixups

Author: nagisa

src/Cargo.lock

@@ -71,8 +71,6 @@ pub use self::context::{Lift, TypeckTables};
 
 pub use self::trait_def::{TraitDef, TraitFlags};
 
-use rustc_i128::u128;
-
 pub mod adjustment;
 pub mod cast;
 pub mod error;

src/librustc/ty/mod.rs

@@ -22,4 +22,3 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_platform_intrinsics = { path = "../librustc_platform_intrinsics" }
 syntax_pos = { path = "../libsyntax_pos" }
 rustc_errors = { path = "../librustc_errors" }
-rustc_i128 = { path = "../librustc_i128" }

src/librustc_typeck/Cargo.toml

@@ -98,8 +98,6 @@ extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_errors as errors;
 
-extern crate rustc_i128;
-
 pub use rustc::dep_graph;
 pub use rustc::hir;
 pub use rustc::lint;

src/librustc_typeck/lib.rs

@@ -21,7 +21,7 @@ pub enum E {
 #[no_mangle]
 pub fn exhaustive_match(e: E) {
 // CHECK: switch{{.*}}, label %[[OTHERWISE:[a-zA-Z0-9_]+]] [
-// CHECK-NEXT: i8 [[DISCR:[0-9]+]], label %[[TRUE:[a-zA-Z0-9_]+]]
+// CHECK-NEXT: i[[TY:[0-9]+]] [[DISCR:[0-9]+]], label %[[TRUE:[a-zA-Z0-9_]+]]
 // CHECK-NEXT: ]
 // CHECK: [[TRUE]]:
 // CHECK-NEXT: br label %[[EXIT:[a-zA-Z0-9_]+]]

src/test/codegen/match.rs

@@ -17,7 +17,7 @@ fn main() {
 // END RUST SOURCE
 // START rustc.node4.SimplifyBranches.initial-before.mir
 // bb0: {
-//     if(const false) -> [true: bb1, false: bb2];
+//     switchInt(const false) -> [0: bb2, otherwise: bb1];
 // }
 // END rustc.node4.SimplifyBranches.initial-before.mir
 // START rustc.node4.SimplifyBranches.initial-after.mir