Rollup of 6 pull requests #112324
Rollup of 6 pull requests #112324
Conversation
The projection may contain inference variables. These inference variables are local to the local inference context. Using `tcx.normalize_erasing_regions` doesn't work here because this method is global and does not have access to the inference context. It's therefore unable to deal with the inference variables. We normalize in the local inference context instead, which knowns about the inference variables.
…-errors Avoid ICE on `#![doc(test(...)]` with literal parameter Close rust-lang#109066 r? `@compiler-errors`
… r=lcnr Resolve vars in result from `scrape_region_constraints` Since we perform `type_op::Normalize` in the local infcx when the new solver is enabled, vars aren't necessarily resolved, which triggers this ICE: https://github.com/rust-lang/rust/blob/f85ab544dfbbce7448993c490ad16c176339b939/compiler/rustc_infer/src/infer/nll_relate/mod.rs#L481 There are more tests that go from ICE -> pass due to this change, but I just added revisions to a few for CI. r? `@lcnr`
Normalize in infcx instead of globally for `Option::as_deref` suggestion fixes rust-lang#112293 The projection may contain inference variables. These inference variables are local to the local inference context. Using `tcx.normalize_erasing_regions` doesn't work here because this method is global and does not have access to the inference context. It's therefore unable to deal with the inference variables. We normalize in the local inference context instead, which knowns about the inference variables. The test looks a little different than the issue example, I made it more minimal and verified that it still ICEs on nightly. Also contains a drive-by fix to properly compare the types. r? `@compiler-errors`
…ompiler-errors Ensure space is inserted after keyword in `unused_delims` Fixes rust-lang#112276
…bject_safety, r=compiler-errors Merge method, type and const object safety checks cc `@spastorino` and `@compiler-errors` on the first commit. I believe it to be correct, as the field is only `Some` for assoc types, so just checking the field without checking the assoc kind to be `Type` is fine. The second commit avoids going through all associated items thrice and just goes over all of them once, running the object safety checks per assoc item kind.
…ENTAILMENT-if-errs, r=eholk Don't mention `IMPLIED_BOUNDS_ENTAILMENT` if signatures reference error Fixes rust-lang#112321
rustbot
added
S-waiting-on-review
|
@bors r+ rollup=never p=7 |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: e6d4725c76 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (adc719d): comparison URL. Overall result: ❌✅ regressions and improvements - ACTION NEEDEDNext Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 647.875s -> 647.471s (-0.06%) |
Successful merges:
#![doc(test(...)]with literal parameter #112081 (Avoid ICE on#![doc(test(...)]with literal parameter)scrape_region_constraints#112196 (Resolve vars in result fromscrape_region_constraints)Option::as_derefsuggestion #112303 (Normalize in infcx instead of globally forOption::as_derefsuggestion)unused_delims#112316 (Ensure space is inserted after keyword inunused_delims)IMPLIED_BOUNDS_ENTAILMENTif signatures reference error #112322 (Don't mentionIMPLIED_BOUNDS_ENTAILMENTif signatures reference error)Failed merges:
if let Some()that always matches to variable #112251 (rustdoc: convertif let Some()that always matches to variable)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup