diff options
| author | bors <bors@rust-lang.org> | 2024-09-12 18:27:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-12 18:27:55 +0000 |
| commit | 2e8db5e9e39c2bf7729113b3041ef4011d90ac5a (patch) | |
| tree | a927ddd18758af947e6e9fb6f4c4830bc3234c62 /compiler/rustc_trait_selection/src | |
| parent | 8c0ec05f7dc9ef185eea9f36c5638e74e43935bf (diff) | |
| parent | ed1602e480a77540593c907a36de7ca3eac3ac81 (diff) | |
| download | rust-2e8db5e9e39c2bf7729113b3041ef4011d90ac5a.tar.gz rust-2e8db5e9e39c2bf7729113b3041ef4011d90ac5a.zip | |
Auto merge of #130281 - matthiaskrgr:rollup-1b2ibs8, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #130101 (some const cleanup: remove unnecessary attributes, add const-hack indications) - #130208 (Introduce `'ra` lifetime name.) - #130263 (coverage: Simplify creation of sum counters) - #130273 (more eagerly discard constraints on overflow) - #130276 (Add test for nalgebra hang in coherence) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/fulfill.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/fulfill.rs b/compiler/rustc_trait_selection/src/solve/fulfill.rs index f5f36f40f7e..cfc73e2e47e 100644 --- a/compiler/rustc_trait_selection/src/solve/fulfill.rs +++ b/compiler/rustc_trait_selection/src/solve/fulfill.rs @@ -302,7 +302,7 @@ fn fulfillment_error_for_stalled<'tcx>( Ok((_, Certainty::Maybe(MaybeCause::Overflow { suggest_increasing_limit }))) => ( FulfillmentErrorCode::Ambiguity { overflow: Some(suggest_increasing_limit) }, // Don't look into overflows because we treat overflows weirdly anyways. - // In `instantiate_response_discarding_overflow` we set `has_changed = false`, + // We discard the inference constraints from overflowing goals, so // recomputing the goal again during `find_best_leaf_obligation` may apply // inference guidance that makes other goals go from ambig -> pass, for example. // |