diff options
| author | bors <bors@rust-lang.org> | 2021-01-28 09:01:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-28 09:01:33 +0000 |
| commit | 0e190206e2ff0c13d64701d9b4145bf89a2d0cab (patch) | |
| tree | f081fe04717328752fade190520b7c3b1579565b /compiler/rustc_codegen_llvm/src/builder.rs | |
| parent | e32f372c4203b2527221b313cf63b05ea178e8a9 (diff) | |
| parent | f3dfbfc8f5f2b17c7f6fe12b4ba48f589d54dc87 (diff) | |
| download | rust-0e190206e2ff0c13d64701d9b4145bf89a2d0cab.tar.gz rust-0e190206e2ff0c13d64701d9b4145bf89a2d0cab.zip | |
Auto merge of #81461 - JohnTitor:rollup-b0ij25f, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #70904 (Stabilize `Seek::stream_position` (feature `seek_convenience`)) - #79951 (Refractor a few more types to `rustc_type_ir` ) - #80868 (Print failure message on all tests that should panic, but don't) - #81062 (Improve diagnostics for Precise Capture) - #81277 (Make more traits of the From/Into family diagnostic items) - #81284 (Make `-Z time-passes` less noisy) - #81379 (Improve URLs handling) - #81416 (Tweak suggestion for missing field in patterns) - #81426 (const_evaluatable: expand abstract consts in try_unify) - #81428 (compiletest: Add two more unit tests) - #81430 (add const_evaluatable_checked test) - #81433 (const_evaluatable: stop looking into type aliases) - #81445 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index f122fa14e70..d2f4d3edc22 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -304,9 +304,8 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { lhs: Self::Value, rhs: Self::Value, ) -> (Self::Value, Self::Value) { - use rustc_ast::IntTy::*; - use rustc_ast::UintTy::*; use rustc_middle::ty::{Int, Uint}; + use rustc_middle::ty::{IntTy::*, UintTy::*}; let new_kind = match ty.kind() { Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.pointer_width)), |