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.

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

Rollup of 4 pull requests #91555

Merged
merged 10 commits into from
Dec 5, 2021
Merged

Rollup of 4 pull requests #91555

merged 10 commits into from
Dec 5, 2021

Commits on Dec 1, 2021

  1. Configuration menu
    Copy the full SHA
    b516a8c View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2021

  1. Don't suggest types whose inner type is erroneous

    Currently, we check if the returned type equals to `tcx.ty_error()` not to emit
    erroneous types, but this has a pitfall; for example,
    `Option<[type error]> != tcx.ty_error()` holds.
    hkmatsumoto committed Dec 4, 2021
    Configuration menu
    Copy the full SHA
    9b77a1e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    63523e4 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. add test

    b-naber committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    9520925 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8ff50fe View commit details
    Browse the repository at this point in the history
  3. bless tests

    b-naber committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    1777f43 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#90529 - b-naber:reborrows-consts, r=lcnr

    Skip reborrows in AbstractConstBuilder
    
    Fixes rust-lang#90455
    
    Temporary fix to prevent confusing diagnostics that refer to implicit borrows and derefs until we allow borrows and derefs on constant expressions.
    
    r? `@oli-obk`
    matthiaskrgr committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    214b2a1 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#91437 - dtolnay:emptybrace, r=nagisa

    Pretty print empty blocks as {}
    
    **Example:**
    
    ```rust
    macro_rules! p {
        ($e:expr) => {
            println!("{}", stringify!($e));
        };
        ($i:item) => {
            println!("{}", stringify!($i));
        };
    }
    
    fn main() {
        p!(if true {});
        p!(struct S {});
    }
    ```
    
    **Before:**
    
    ```console
    if true { }
    struct S {
    }
    ```
    
    **After:**
    
    ```console
    if true {}
    struct S {}
    ```
    
    This affects [`dbg!`](https://doc.rust-lang.org/std/macro.dbg.html), as well as ecosystem uses of stringify such as in [`anyhow::ensure!`](https://docs.rs/anyhow/1/anyhow/macro.ensure.html). Printing a `{ }` in today's heavily rustfmt'd world comes out looking jarring/sloppy.
    matthiaskrgr committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    a8f8f74 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#91450 - hkmatsumoto:hide-type-error, r=este…

    …bank
    
    Don't suggest types whose inner type is erroneous
    
    Currently, we check if the returned type equals to `tcx.ty_error()` not to emit
    erroneous types, but this has a pitfall; for example,
    `Option<[type error]> != tcx.ty_error()` holds.
    
    Fixes rust-lang#91371.
    matthiaskrgr committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    609d9a0 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#91535 - Aaron1011:stabilize-future-incompat…

    …, r=nagisa
    
    Stabilize `-Z emit-future-incompat` as `--json future-incompat`
    
    The FCP was completed in rust-lang#71249
    matthiaskrgr committed Dec 5, 2021
    Configuration menu
    Copy the full SHA
    068b304 View commit details
    Browse the repository at this point in the history