Uh oh!
There was an error while loading. Please reload this page.
Rollup of 8 pull requests - #101526
Closed
Dylan-DPC wants to merge 18 commits into
Closed
Conversation
I missed one from 096efc2.
- Add a `HandleCycleError` enum to rustc_query_system, along with a `handle_cycle_error` function - Move `Value` to rustc_query_system, so `handle_cycle_error` can use it - Move the `Value` impls from rustc_query_impl to rustc_middle. This is necessary due to orphan rules.
overriden -> overridden
Reimplement `carrying_add` and `borrowing_sub` for signed integers. As per the discussion in rust-lang#85532, this PR reimplements `carrying_add` and `borrowing_sub` for signed integers. It also adds unit tests for both unsigned and signed integers, emphasing on the behaviours of the methods.
…r=cjgillot Make `HandleCycleError` an enum instead of a macro-generated closure Helps with rust-lang#96524. Based on rust-lang#100943 to avoid merge conflicts, so it looks larger than it is (only the last commit is relevant). cc https://rust-lang.zulipchat.com/#narrow/stream/241847-t-compiler.2Fwg-incr-comp/topic/Moving.20.60Value.60.20to.20rustc_query_system.20.2396524 r? `@cjgillot`
…estebank Shrink span for bindings with subpatterns. Bindings with nested patterns (`binding @ pat` syntax) currently point to the full pattern. This PR proposes to shrink the span to stop before the ```@`.`` This makes the diagnostics for move/mutability conflicts clearer, as they not point to the `binding` only, instead of the full pat. r? ``@estebank``
…ywiser Remove unnecessary `EMIT_MIR_FOR_EACH_BITWIDTH` This commit removes the annotation only for those tests where the 32 bit and 64 bit files were exactly identical. I didn't touch anything in the `mir-opt/const` directory, since having this annotation there seems more principled, even if it doesn't make a difference. This also removes four additional files related to the `separate_const_switch.rs` test. The associated annotations were removed in rust-lang#100827 , but I forgot to remove the files as well. (rust-lang#97564 is the issue tracking an automated check here) r? ``@wesleywiser``
Avoid UB in the Windows filesystem code in... bootstrap? This basically a subset of the changes from rust-lang#101171. I didn't think to look in src/bootstrap for more windows filesystem API usage, which was apparently a mistake on my part. It's kinda goofy that stuff like this is in here, but what are you gonna do, computers are awful. I also added `winbase` to the `winapi` dep -- I tested this in a tmp crate but needed to add this to your Cargo.toml -- you `use winapi::stuff::winbase` in this function, but are relying on something else turning on that feature.
…omcc Open a BCrypt algorithm handle Fixesrust-lang#101474, supplants rust-lang#101456. Replaces use of a pseduo handle with manually opening a algorithm handle. Most interesting thing here is the atomics. r? `@thomcc`
…ince-2, r=GuillaumeGomez rustdoc: remove unused CSS `#main-content > .since` I missed one from rust-lang#101298
Fix typo in pass_manager.rs overriden -> overridden
Dylan-DPC
commented
Sep 7, 2022
MemberAuthor
@bors r+ rollup=never p=5 |
bors
commented
Sep 7, 2022
Collaborator
bors
commented
Sep 7, 2022
Collaborator
⌛ Testing commit 335049c with merge 4537b561deb58b729e1c296bf62e544c20e36707... |
bors
commented
Sep 7, 2022
Collaborator
💔 Test failed - checks-actions |
jyn514
commented
Sep 7, 2022
Member
#101303 was marked rollup=never. Why did you put it in this rollup? |
Dylan-DPC
commented
Sep 7, 2022
MemberAuthor
It didnt show me when i was creating I guess, odd |
Dylan-DPC
commented
Sep 7, 2022
MemberAuthor
@bors treeclosed=1000 (github issues) |
jyn514
commented
Sep 7, 2022
Member
@bors ping |
bors
commented
Sep 7, 2022
Collaborator
😪 I'm awake I'm awake |
This was referenced Sep 7, 2022
Merged
Merged
rust-log-analyzer
commented
Sep 7, 2022
Collaborator
This was referenced Sep 7, 2022
bors
commented
Sep 7, 2022
Collaborator
☔ The latest upstream changes (presumably #101476) made this pull request unmergeable. Please resolve the merge conflicts. |
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
12 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:
carrying_addandborrowing_subfor signed integers. #93873 (Reimplementcarrying_addandborrowing_subfor signed integers.)HandleCycleErroran enum instead of a macro-generated closure #101303 (MakeHandleCycleErroran enum instead of a macro-generated closure)EMIT_MIR_FOR_EACH_BITWIDTH#101435 (Remove unnecessaryEMIT_MIR_FOR_EACH_BITWIDTH)#main-content > .since#101506 (rustdoc: remove unused CSS#main-content > .since)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup