diff options
| author | Ralf Jung <post@ralfj.de> | 2022-11-15 12:06:20 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-11-16 10:13:29 +0100 |
| commit | 1115ec601a7f7dc2406e26cd5da0faf031043b81 (patch) | |
| tree | 233577aac0ef181bcc4c8f569ecb53774da9c87a /compiler/rustc_monomorphize/src | |
| parent | 3b91b1a37bbb607348b8713d2e8f1051bf414048 (diff) | |
| download | rust-1115ec601a7f7dc2406e26cd5da0faf031043b81.tar.gz rust-1115ec601a7f7dc2406e26cd5da0faf031043b81.zip | |
cleanup and dedupe CTFE and Miri error reporting
Diffstat (limited to 'compiler/rustc_monomorphize/src')
| -rw-r--r-- | compiler/rustc_monomorphize/src/collector.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_monomorphize/src/collector.rs b/compiler/rustc_monomorphize/src/collector.rs index e296d4766c1..cdf8011d4f5 100644 --- a/compiler/rustc_monomorphize/src/collector.rs +++ b/compiler/rustc_monomorphize/src/collector.rs @@ -773,7 +773,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> { match self.tcx.const_eval_resolve(param_env, ct.expand(), None) { // The `monomorphize` call should have evaluated that constant already. Ok(val) => val, - Err(ErrorHandled::Reported(_) | ErrorHandled::Linted) => return, + Err(ErrorHandled::Reported(_)) => return, Err(ErrorHandled::TooGeneric) => span_bug!( self.body.source_info(location).span, "collection encountered polymorphic constant: {:?}", @@ -788,7 +788,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirNeighborCollector<'a, 'tcx> { match self.tcx.const_eval_resolve(param_env, uv, None) { // The `monomorphize` call should have evaluated that constant already. Ok(val) => val, - Err(ErrorHandled::Reported(_) | ErrorHandled::Linted) => return, + Err(ErrorHandled::Reported(_)) => return, Err(ErrorHandled::TooGeneric) => span_bug!( self.body.source_info(location).span, "collection encountered polymorphic constant: {:?}", |