Skip to content

Rollup of 3 pull requests#7240

Merged
bors merged 7 commits into
rust-lang:masterfrom
flip1995:rollup-6nwjgyp
May 18, 2021
Merged

Rollup of 3 pull requests#7240
bors merged 7 commits into
rust-lang:masterfrom
flip1995:rollup-6nwjgyp

Conversation

@flip1995

@flip1995 flip1995 commented May 18, 2021

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

changelog: rollup

camsteffen and others added 7 commits May 17, 2021 13:54
…=flip1995

Fix another manual_unwrap_or deref FP

changelog: none (since this just piggybacks on rust-lang#7233)

Fixes rust-lang#6960
…ip1995

Add the command to add upstream remote

changelog: none

Adding this command should better help new contributors.
CI: update rustup before installing the toolchain on windows

Ok, fine windows, if this is what you want, take it...

r? `@ghost`

changelog: none
@rustbot rustbot added the rollup A PR which is a rollup label May 18, 2021
@flip1995

Copy link
Copy Markdown
Member Author

@bors r+ p=3

@bors

bors commented May 18, 2021

Copy link
Copy Markdown
Contributor

📌 Commit 70c552b has been approved by flip1995

bors added a commit that referenced this pull request May 18, 2021
Rollup of 3 pull requests

Successful merges:

 - #7235 (Fix another manual_unwrap_or deref FP)
 - #7237 (Add the command to add upstream remote)
 - #7239 (CI: update rustup before installing the toolchain on windows)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors

bors commented May 18, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 70c552b with merge 561e943...

@bors

bors commented May 18, 2021

Copy link
Copy Markdown
Contributor

💔 Test failed - checks-action_test

@flip1995

Copy link
Copy Markdown
Member Author

@bors retry

@bors

bors commented May 18, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 70c552b with merge 213b8d9...

@bors

bors commented May 18, 2021

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 213b8d9 to master...

@bors bors merged commit 213b8d9 into rust-lang:master May 18, 2021
@flip1995 flip1995 deleted the rollup-6nwjgyp branch May 18, 2021 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants