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

[beta] Prepare beta 1.63.0 #98572

Merged
merged 23 commits into from
Jun 28, 2022
Merged

[beta] Prepare beta 1.63.0 #98572

merged 23 commits into from
Jun 28, 2022

Commits on Jun 13, 2022

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

Commits on Jun 14, 2022

  1. Pass --locked when installing rustfmt in integration tests

    There was recently an issue where `cargo install` was installing a newer
    version of a dependency than the one listed in our Cargo.toml. The newer
    version added deprecation warnings that caused our continuous integration
    tests to break.
    
    As mentioned in the `cargo help install` docs, passing the `--locked`
    flag should force cargo to use the `Cargo.lock` file included with
    the repository.
    ytmimi authored and calebcartwright committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    1a6146e View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Backport 3795

    fix sorting of use statements with raw identifiers
    ytmimi authored and calebcartwright committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    5ae94cc View commit details
    Browse the repository at this point in the history
  2. Add Version information to UseSegment

    There are some proposed import sorting changes for raw identifier `r#`.
    These changes constitute a breaking change, and need to be version
    gagted. Before version gating those changes we add the version
    information to the `UseSegment`.
    ytmimi authored and calebcartwright committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    795efb2 View commit details
    Browse the repository at this point in the history
  3. Version gate raw identifier use statement sorting

    When useing `version=One` rustfmt will treat the leading `r#` as part of
    the `UseSegment` used for sorting. When using `version=Two` rustfmt will
    ignore the leading `r#` and only consider the name of the identifier
    when sorting the `UseSegment`.
    ytmimi authored and calebcartwright committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    e44380b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    76cbc1d View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#97757 - xFrednet:rfc-2383-expect-with-force…

    …-warn, r=wesleywiser,flip1995
    
    Support lint expectations for `--force-warn` lints (RFC 2383)
    
    Rustc has a `--force-warn` flag, which overrides lint level attributes and forces the diagnostics to always be warn. This means, that for lint expectations, the diagnostic can't be suppressed as usual. This also means that the expectation would not be fulfilled, even if a lint had been triggered in the expected scope.
    
    This PR now also tracks the expectation ID in the `ForceWarn` level. I've also made some minor adjustments, to possibly catch more bugs and make the whole implementation more robust.
    
    This will probably conflict with rust-lang#97718. That PR should ideally be reviewed and merged first. The conflict itself will be trivial to fix.
    
    ---
    
    r? `@wesleywiser`
    
    cc: `@flip1995` since you've helped with the initial review and also discussed this topic with me. 🙃
    
    Follow-up of: rust-lang#87835
    
    Issue: rust-lang#85549
    
    Yeah, and that's it.
    matthiaskrgr committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    ac2b7a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. Add width for codeblocks in comments (rust-lang#5372)

    * add doc_comment_code_block_width configuration
    
    * updated config docu
    
    * Updated docu and changed tests to config folder
    sec65 committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    33c6074 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2022

  1. Set package.metadata.rust-analyzer.rustc_private=true in Cargo.toml

    By setting this value in the Cargo.toml rust-analyzer understands that
    rustfmt uses compiler-internals using `extern crate`.
    
    This is a universal step that all developers will need to take in order to
    get better type hints and code completion suggestions for
    compiler-internals in their editor.
    
    **Note**: users will also need to install the `rustc-dev` component via
    `rustup` and add the following to their rust-analyzer configuration:
    
    ```json
    {
        "rust-analyzer.rustcSource": "discover",
        "rust-analyzer.updates.channel": "nightly"
    }
    ```
    ytmimi authored and calebcartwright committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    3de1a09 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. ci: include config_proc_macro crate in ci (rust-lang#5389)

    * config_proc_macro: fix failing doctests
    
    * ci: include config_proc_macro crate in ci
    
    * [review] working native windows ci
    
    * [fix] add --locked file for ci
    
    * [fix] quoting of cmd variables
    tommilligan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    2c8b3be View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. Revert "Memoize format_expr"

    Fixes 5399
    
    Memoizing expressions lead to cases where rustfmt's stability guarantees
    were violated.
    
    This reverts commit a37d3ab.
    ytmimi authored and calebcartwright committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    0156575 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a187091 View commit details
    Browse the repository at this point in the history
  3. Fix issue where cargo fmt --version would not display version info

    Fixes 5395
    
    In PR 5239 we switched from using `structopt` to `clap`. It seems that
    the default behavior for `clap` is to override the `--version` flag,
    which prevented our custom version display code from running.
    
    The fix as outlined in clap-rs/clap#3405 was
    to set `#[clap(global_setting(AppSettings::NoAutoVersion))]` to prevent
    clap from setting its own default behavior for the `--version` flag.
    ytmimi authored and calebcartwright committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    08105e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. Configuration menu
    Copy the full SHA
    f43c966 View commit details
    Browse the repository at this point in the history
  2. Revert "Memoize format_expr"

    This reverts commit a37d3ab.
    calebcartwright committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    778e1b1 View commit details
    Browse the repository at this point in the history
  3. chore: bump toolchain

    calebcartwright committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    dc2d86d View commit details
    Browse the repository at this point in the history
  4. Merge pull request rust-lang#5405 from calebcartwright/subtree-sync-2…

    …022-06-22
    
    Subtree sync 2022 06 22
    calebcartwright committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    224f1c9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c4416f2 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2022

  1. bump channel to beta

    pietroalbini committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    8ccd130 View commit details
    Browse the repository at this point in the history
  2. Bump RLS to latest master on rust-lang/rls

    Of primary interest, this merges
    rust-lang/rls@ece09b8 into rust-lang/rust,
    which brings in the changes that fix RLS tests broken by rust-lang#97853. rust-lang#97853 already
    introduced that commit's changes (under
    27f4044df03d15c7c38a483c3e4635cf4f51807d) but without putting those changes on
    rust-lang/rls as a branch, so we ended up with an orphan commit that caused
    trouble when updating submodules in rust-lang/rust.
    
    This commit, once merged into rust-lang/rust, should continue to let RLS tests
    to pass on rust-lang/rust's side and move us back into a healthy state where tip
    of the submodule points to a valid master commit in the rust-lang/rls
    repository.
    Mark-Simulacrum authored and pietroalbini committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    b8b04f1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    506404e View commit details
    Browse the repository at this point in the history
  4. update rustfmt

    calebcartwright authored and pietroalbini committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    0e383da View commit details
    Browse the repository at this point in the history
  5. Globally set RUSTC_BOOTSTRAP

    This is a beta-only commit to avoid problems introduced by rust-lang#97277; we will want
    a more targeted patch that specifically re-enables this for a subset of the
    books (nomicon, unstable book, ...?) and testing via a stable-branch builder for
    tools, but that isn't worth backporting.
    Mark-Simulacrum committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    1445c6c View commit details
    Browse the repository at this point in the history