Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 3 pull requests #70534

Merged
merged 6 commits into from
Mar 29, 2020
Merged

Rollup of 3 pull requests #70534

merged 6 commits into from
Mar 29, 2020

Commits on Mar 19, 2020

  1. Add Result<Result<T, E>, E>::flatten -> Result<T, E>

    @Nemo157
    Nemo157 committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    6fe7867 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2020

  1. reduce rustc_attr usage in places

    @Centril
    Centril committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    59a6970 View commit details
    Browse the repository at this point in the history

  2. Update LLVM submodule

    @Amanieu
    Amanieu committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    4a4314e View commit details
    Browse the repository at this point in the history

  3. Rollup merge of rust-lang#70140 - Nemo157:result-flatten, r=Amanieu 

    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
    Centril committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    8212a1c View commit details
    Browse the repository at this point in the history

  4. Rollup merge of rust-lang#70526 - Centril:less-attr, r=eddyb 

    reduce `rustc_attr` usage in places

This cleans up some unused `rustc_attr` dependencies.
    @Centril
    Centril committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    b4491e5 View commit details
    Browse the repository at this point in the history

  5. Rollup merge of rust-lang#70527 - Amanieu:fix_fastisel, r=Mark-Simula… 

    …crum

Update LLVM submodule

Fixes rust-lang#70148
    @Centril
    Centril committed Mar 29, 2020
    Configuration menu
    Copy the full SHA
    b851591 View commit details
    Browse the repository at this point in the history