Skip to content

Rollup of 2 pull requests #93702

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 5 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

scottmcm and others added 5 commits February 1, 2022 21:53
Just a refactor (and rename) for now, so it's not `Result`-specific.

This could be used for a future `Iterator::try_collect`, or similar, but anything like that is left for a future PR.
The `Cargo.toml` has `edition = "2021"`, so that's what the command line should use too.
The following *-unwind ABIs are now supported:
- "C-unwind"
- "cdecl-unwind"
- "stdcall-unwind"
- "fastcall-unwind"
- "vectorcall-unwind"
- "thiscall-unwind"
- "aapcs-unwind"
- "win64-unwind"
- "sysv64-unwind"
- "system-unwind"
Add more *-unwind ABI variants

The following *-unwind ABIs are now supported:
- "C-unwind"
- "cdecl-unwind"
- "stdcall-unwind"
- "fastcall-unwind"
- "vectorcall-unwind"
- "thiscall-unwind"
- "aapcs-unwind"
- "win64-unwind"
- "sysv64-unwind"
- "system-unwind"

cc ````@rust-lang/wg-ffi-unwind````
Change `ResultShunt` to be generic over `Try`

Just a refactor (and rename) for now, so it's not `Result`-specific.

This could be used for a future `Iterator::try_collect`, or similar, but anything like that is left for a future PR.
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 6, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented Feb 6, 2022

📌 Commit c50bd25 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 6, 2022
@bors
Copy link
Collaborator

bors commented Feb 6, 2022

⌛ Testing commit c50bd25 with merge 0da55b19befceb81ac009b20d95af217a53919c7...

@rust-log-analyzer
Copy link
Collaborator

The job dist-x86_64-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[TIMING] Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 2, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } } -- 0.000
Build completed successfully in 0:20:46
+ RUSTC_BOOTSTRAP=1
+ ./build/x86_64-unknown-linux-gnu/stage2/bin/rustc --edition=2018 --crate-type=lib ../library/core/src/lib.rs
error[E0501]: cannot borrow `self.iter` as mutable because previous closure requires unique access
   --> ../library/core/src/iter/adapters/mod.rs:182:9
182 | /         self.iter
182 | /         self.iter
183 | |             .try_fold(init, |acc, x| match Try::branch(x) {
    | |              --------       -------- closure construction occurs here
    | |              first borrow later used by call
    | |              first borrow later used by call
184 | |                 ControlFlow::Continue(x) => ControlFlow::from_try(f(acc, x)),
185 | |                 ControlFlow::Break(r) => {
186 | |                     *self.residual = Some(r);
    | |                     -------------- first borrow occurs due to use of `self` in closure
187 | |                     ControlFlow::Break(try { acc })
189 | |             })
189 | |             })
    | |______________^ second borrow occurs here

error[E0500]: closure requires unique access to `self` but it is already borrowed
   --> ../library/core/src/iter/adapters/mod.rs:183:29
182 | /         self.iter
182 | /         self.iter
183 | |             .try_fold(init, |acc, x| match Try::branch(x) {
    | |              --------       ^^^^^^^^ closure construction occurs here
    | |              first borrow later used by call
    | |              first borrow later used by call
184 | |                 ControlFlow::Continue(x) => ControlFlow::from_try(f(acc, x)),
185 | |                 ControlFlow::Break(r) => {
186 | |                     *self.residual = Some(r);
    | |                     -------------- second borrow occurs due to use of `self` in closure
187 | |                     ControlFlow::Break(try { acc })
189 | |             })
189 | |             })
    | |______________- borrow occurs here
error: aborting due to 2 previous errors

Some errors have detailed explanations: E0500, E0501.
For more information about an error, try `rustc --explain E0500`.

@bors
Copy link
Collaborator

bors commented Feb 6, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 6, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-sqqz2eg branch February 13, 2022 00:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants