diff options
| author | bors <bors@rust-lang.org> | 2019-05-01 09:32:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-01 09:32:58 +0000 |
| commit | 47e0803d5c2ad5952220f2c260d7e12921c1d3fe (patch) | |
| tree | 8b445983b08af70b773ed7b39a7f7bac21477acc /src/librustc_codegen_ssa | |
| parent | 834bd1959cc06bbae08e7de65f09f326d1702a95 (diff) | |
| parent | 7261bd88ace006a5b85bfbcbcb9c213ede3a6fd1 (diff) | |
| download | rust-47e0803d5c2ad5952220f2c260d7e12921c1d3fe.tar.gz rust-47e0803d5c2ad5952220f2c260d7e12921c1d3fe.zip | |
Auto merge of #60195 - varkor:commontypes-to-common, r=eddyb
Split `CommonTypes` into `CommonTypes` and `CommonLifetimes` The so-called "`CommonTypes`" contains more than just types. r? @eddyb
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/mir/rvalue.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_ssa/mir/rvalue.rs b/src/librustc_codegen_ssa/mir/rvalue.rs index 35e9d918aa6..1caafb014e0 100644 --- a/src/librustc_codegen_ssa/mir/rvalue.rs +++ b/src/librustc_codegen_ssa/mir/rvalue.rs @@ -371,7 +371,7 @@ impl<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { (bx, OperandRef { val, layout: self.cx.layout_of(self.cx.tcx().mk_ref( - self.cx.tcx().types.re_erased, + self.cx.tcx().lifetimes.re_erased, ty::TypeAndMut { ty, mutbl: bk.to_mutbl_lossy() } )), }) |