Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #112774
Merged
Merged
Conversation
Blessing 32-bit tests on 64-bit hosts relies on having a corresponding 32-bit target that can be built "easily" on those hosts. ARM Macs don't have a corresponding 32-bit target, so trying to build one is usually going to fail.
…ments-twice, r=cjgillot Don't record adjustments twice in `note_source_of_type_mismatch_constraint` We call `lookup_method` a few times in `note_source_of_type_mismatch_constraint`, but that function has side-effects to the typeck results. Replace it with a less side-effect-y variant of the function for use in diagnostics. Specifically the ICE in rust-lang#112532 happens because we're recording deref adjustments twice for a call receiver, which causes `ExprUseVisitor` to be angry. Fixesrust-lang#112532
cleanup azure leftovers Continuation of rust-lang#97756
Test `x.ps1` in `msvc` CI job Small adjustment to rust-lang#112633, to resolve [this comment](rust-lang#112633 (comment)). r? `@pietroalbini`
…cjgillot Re-use the deref-pattern recursion instead of duplicating the logic This essentially just removes code duplication
Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts rust-lang#112418 added special support for automatically blessing 32-bit output on 64-bit hosts, for the subset of `mir-opt` tests that are pointer-width-dependent. This relies on the 64-bit host having some corresponding 32-bit target that can be built “easily”. For most 64-bit hosts this is fine, but ARM Macs don't have a corresponding 32-bit target. (There have never been 32-bit ARM Macs, and ARM Macs don't have the libraries needed for building `i686-apple-darwin`.) There is an entry for `("i686-apple-darwin", "aarch64-apple-darwin")` in the list of corresponding 32-bit platforms, but this doesn't actually work on ARM Macs. Instead, the bootstrap invocation fails to build the necessary 32-bit target support, and nothing gets tested or blessed. According to [this Zulip thread](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Can't.20bless.20any.20mir-opt.20tests.20on.20aarch64.20Mac/near/367109789), that mapping was only added because the author assumed it would work. But since it doesn't actually work on ARM Macs, the solution is to just remove that mapping. With the mapping removed, ARM Macs still can't auto-bless 32-bit output (they will see a warning instead), but at least they can now bless the output of `mir-opt` tests that don't care about pointer width.
…henkov
refactor(resolve): delete update_resolution function
The `{ resolution.single_imports.remove(); }` code block does not modify the `binding` of this `resolution`. Therefore, the result of `resolution.binding()` before and after `let t = f(self, resolution)` will remain the same, and it will always satisfy the result: `_ if old_binding.is_some() => return t` or `None => return t`.
And then we delete the `update_resolution` function because it only called once.
r? ``@petrochenkov``compiler-errors
commented
Jun 18, 2023
ContributorAuthor
@bors r+ rollup=never p=6 |
bors
commented
Jun 18, 2023
Collaborator
bors
commented
Jun 18, 2023
Collaborator
bors
commented
Jun 19, 2023
Collaborator
☀️ Test successful - checks-actions |
rust-timer
commented
Jun 19, 2023
Collaborator
📌 Perf builds for each rolled up PR: previous master: 2d0aa57684 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
This was referenced Jun 19, 2023
rust-timer
commented
Jun 19, 2023
Collaborator
Finished benchmarking commit (f217411): comparison URL. Overall result: ✅ improvements - no action needed@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: 657.452s -> 656.587s (-0.13%) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
note_source_of_type_mismatch_constraint#112537 (Don't record adjustments twice innote_source_of_type_mismatch_constraint)x.ps1inmsvcCI job #112668 (Testx.ps1inmsvcCI job)mir-opttests on ARM Mac hosts #112753 (Don't try to auto-bless 32-bitmir-opttests on ARM Mac hosts)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup