Skip to content

Rollup of 3 pull requests - #70534

Merged
bors merged 6 commits into
rust-lang:masterfrom
Centril:rollup-t59tcx2
Mar 29, 2020
Merged

Rollup of 3 pull requests#70534
bors merged 6 commits into
rust-lang:masterfrom
Centril:rollup-t59tcx2

Conversation

@Centril

@CentrilCentril commented Mar 29, 2020

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Nemo157and others added 6 commits March 19, 2020 11:21
@Nemo157
Add Result<Result<T, E>, E>::flatten -> Result<T, E>
6fe7867
@Centril
reduce rustc_attr usage in places
59a6970
@Amanieu
Update LLVM submodule
4a4314e
@Centril
Rollup merge ofrust-lang#70140- Nemo157:result-flatten, r=Amanieu
8212a1c
Add Result<Result<T, E>, E>::flatten -> Result<T, E>
This PR makes this possible (modulo type inference):
```rust
assert_eq!(Ok(6), Ok(Ok(6)).flatten());
```
Tracking issue: rust-lang#70142
<sub>largely cribbed directly from <https://github.com/rust-lang/rust/pull/60256></sub>
@Centril
Rollup merge ofrust-lang#70526- Centril:less-attr, r=eddyb
b4491e5
reduce `rustc_attr` usage in places
This cleans up some unused `rustc_attr` dependencies.
@Centril
Rollup merge ofrust-lang#70527- Amanieu:fix_fastisel, r=Mark-Simula…
b851591
…crum
Update LLVM submodule
Fixesrust-lang#70148
@Centril

Centril commented Mar 29, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=3 rollup=never

@bors

bors commented Mar 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit b851591 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 29, 2020
@bors

bors commented Mar 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b851591 with merge 285519d...

@bors

bors commented Mar 29, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 285519d to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2020
@bors
bors merged commit 285519d into rust-lang:masterMar 29, 2020
@Centril
Centril deleted the rollup-t59tcx2 branch March 29, 2020 22:31
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Centril@bors@Nemo157@Amanieu