diff options
| author | bors <bors@rust-lang.org> | 2018-11-07 03:21:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-07 03:21:02 +0000 |
| commit | 1433507eba7d1a114e4c6f27ae0e1a74f60f20de (patch) | |
| tree | bdefceb804ebe06423a47711fd1132f3b2219818 /src/librustc/traits/structural_impls.rs | |
| parent | da5f414c2c0bfe5198934493f04c676e2b23ff2e (diff) | |
| parent | 59e6ce4b19a8c2b9ec9a1fbf51ed232b040b177b (diff) | |
| download | rust-1.30.1.tar.gz rust-1.30.1.zip | |
Auto merge of #55738 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.30.1
1.30.1 stable release I believe this includes all of the relevant pieces from https://github.com/rust-lang/rust/issues/55594. Backports all proceeded smoothly. cc @rust-lang/release
Diffstat (limited to 'src/librustc/traits/structural_impls.rs')
| -rw-r--r-- | src/librustc/traits/structural_impls.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/traits/structural_impls.rs b/src/librustc/traits/structural_impls.rs index 10e930d1c92..6b0b1c35a7e 100644 --- a/src/librustc/traits/structural_impls.rs +++ b/src/librustc/traits/structural_impls.rs @@ -175,7 +175,7 @@ impl<'a, 'tcx> Lift<'tcx> for traits::SelectionError<'a> { super::ConstEvalFailure(ref err) => tcx.lift(&**err).map(|err| super::ConstEvalFailure( err.into(), )), - super::Overflow => bug!(), // FIXME: ape ConstEvalFailure? + super::Overflow => Some(super::Overflow), } } } |