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 17 pull requests #73947

Closed
wants to merge 41 commits into from

Commits on May 25, 2020

  1. Remove legacy InnoSetup GUI installer

    On Windows the InnoSetup installer was superseded by the MSI installer. It's no longer needed.
    ChrisDenton committed May 25, 2020
    Configuration menu
    Copy the full SHA
    912963b View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Configuration menu
    Copy the full SHA
    144206e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c98b4c8 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. Recover extra trailing angle brackets in struct definition

    This commit applies the existing 'extra angle bracket recovery' logic
    when parsing fields in struct definitions. This allows us to continue
    parsing the struct's fields, avoiding spurious 'missing field' errors in
    code that tries to use the struct.
    Aaron1011 committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    765bd47 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8e899b1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7055c23 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Configuration menu
    Copy the full SHA
    14d0370 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e8f5785 View commit details
    Browse the repository at this point in the history
  3. Fix markdown rendering in librustc_lexer docs

    Use back-ticks instead of quotation marks in docs for the block comment
    variant of TokenKind.
    pierwill committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    49c1018 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

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

Commits on Jun 30, 2020

  1. ci: fix wasm32 broken due to a NodeJS version bump

    Emscripten's SDK recently bumped the version of NodeJS they shipped, but
    our Dockerfile for the wasm32 builder hardcoded the version number. This
    will cause consistent CI failures once the currently cached image is
    rebuilt (either due to a change or due to the cache expiring).
    
    This commit fixes the problem by finding the latest version of NodeJS in
    the Emscripten SDK and symlinking it to a "latest" directory, which is
    then added to the PATH.
    pietroalbini committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    844dc31 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f74a7d3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c225e5c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1b3ef66 View commit details
    Browse the repository at this point in the history
  5. remove duplicate tests

    lcnr committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    0889d79 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e3cbb62 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    51858da View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2020

  1. Rewrite a few manual index loops with while-let

    There were a few instances of this pattern:
    
    ```rust
    while index < vec.len() {
        let item = &vec[index];
        // ...
    }
    ```
    
    These can be indexed at once:
    
    ```rust
    while let Some(item) = vec.get(index) {
        // ...
    }
    ```
    
    Particularly in `ObligationForest::process_obligations`, this mitigates
    a codegen regression found with LLVM 11 (rust-lang#73526).
    cuviper committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    47425e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7616cd9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b438811 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a5764de View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b37434e View commit details
    Browse the repository at this point in the history
  6. Fix comment typo

    kraai committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    9ce1d19 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    eb4ba55 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. Rollup merge of rust-lang#72569 - ChrisDenton:remove-innosetup, r=nik…

    …omatsakis
    
    Remove legacy InnoSetup GUI installer
    
    On Windows the InnoSetup `.exe` installer was superseded by the MSI installer long ago. It's no longer needed.
    
    The `.exe` installer hasn't been linked from the [other installation methods](https://forge.rust-lang.org/infra/other-installation-methods.html#standalone) page in many years. As far as I can tell the intent was always to remove this installer once the MSI proved itself. Though admittedly both installers feel very "legacy" at this point.
    
    Removing this would mean we only maintain one Windows GUI installer and would speed up the distribution phase.
    
    As a result of removing InnoSetup, this closes rust-lang#24397
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    8f540c2 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#72983 - Lezzz:rename-typeck, r=nikomatsakis

    Rename TypeckTables to TypeckResults.
    
    Originally suggested by @eddyb.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    13faeea View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#73306 - calebzulawski:target-feature-11-fn-…

    …trait-soundness, r=nikomatsakis
    
    Don't implement Fn* traits for #[target_feature] functions
    
    Closes rust-lang#72012.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    aacf886 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#73345 - petrochenkov:nointerp, r=Aaron1011

    expand: Stop using nonterminals for passing tokens to attribute and derive macros
    
    Make one more step towards fully token-based expansion and fix issues described in rust-lang#72545 (comment).
    
    Now `struct S;` is passed to `foo!(struct S;)` and `#[foo] struct S;` in the same way - as a token stream `struct S ;`, rather than a single non-terminal token `NtItem` which is then broken into parts later.
    
    The cost is making pretty-printing of token streams less pretty.
    Some of the pretty-printing regressions will be recovered by keeping jointness with each token, which we will need to do anyway.
    
    Unfortunately, this is not exactly the same thing as rust-lang#73102.
    One more observable effect is how `$crate` is printed in the attribute input.
    Inside `NtItem` was printed as `crate` or `that_crate`, now as a part of a token stream it's printed as `$crate` (there are good reasons for these differences, see rust-lang#62393 and related PRs).
    This may break old proc macros (custom derives) written before the main portion of the proc macro API (macros 1.2) was stabilized, those macros did `input.to_string()` and reparsed the result, now that result can contain `$crate` which cannot be reparsed.
    
    So, I think we should do this regardless, but we need to run crater first.
    r? @Aaron1011
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    f228679 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#73449 - ehuss:duplicate-lang-item, r=matthe…

    …wjasper
    
    Provide more information on duplicate lang item error.
    
    This gives some notes on the location of the files where the lang items were loaded from. Some duplicate lang item errors can be a little confusing, and this might help in diagnosing what has happened.
    
    Here's an example when hitting a bug with Cargo's build-std:
    
    ```
    error: duplicate lang item in crate `core` (which `rustc_std_workspace_core` depends on): `try`.
      |
      = note: the lang item is first defined in crate `core` (which `z10` depends on)
      = note: first definition in `core` loaded from /Users/eric/Proj/rust/cargo/scratch/z10/target/target/debug/deps/libcore-a764da499c7385f4.rmeta
      = note: second definition in `core` loaded from /Users/eric/Proj/rust/cargo/scratch/z10/target/target/debug/deps/libcore-5b082675aea34986.rmeta
    ```
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    5c3f879 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#73803 - Aaron1011:feature/angle-field-recov…

    …ery, r=matthewjasper
    
    Recover extra trailing angle brackets in struct definition
    
    This commit applies the existing 'extra angle bracket recovery' logic
    when parsing fields in struct definitions. This allows us to continue
    parsing the struct's fields, avoiding spurious 'missing field' errors in
    code that tries to use the struct.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    fa2a99a View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#73812 - petrochenkov:prettyref, r=varkor

    ast_pretty: Pass some token streams and trees by reference
    
    Salvaged from an intermediate version of rust-lang#73345.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    42005ab View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#73839 - crlf0710:snapshot_the_reality, r=Ma…

    …nishearth
    
    Split and expand nonstandard-style lints unicode unit test.
    
    RFC 2457 requested that the `nonstandard_style` series of linted be adjusted to cover the non_ascii_identifier case. However when i read the code of those implementations, it seems they're already supporting non_ascii_identifiers. But the exact rules is a little different than what's proposed in RFC 2457.
    
    So I splitted and expanded the existing test case to try to exercise every branch in the code. I think it'll also be easier to examine the cases in these unit tests to see whether it's ok to just leave them as is, or some adjustments are needed.
    
    r? @Manishearth
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    15c01a4 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#73841 - tmiasko:print-region-graph, r=Mark-…

    …Simulacrum
    
    Remove defunct `-Z print-region-graph`
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    bdda063 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#73848 - pierwill:pierwill-lexer-block-doc, …

    …r=jonas-schievink
    
    Fix markdown rendering in librustc_lexer docs
    
    Use back-ticks instead of quotation marks in docs for the block comment variant of TokenKind.
    
    ## [Before](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_lexer/enum.TokenKind.html#variant.BlockComment) and after
    
    <img width="1103" alt="Screen Shot 2020-06-28 at 1 22 30 PM" src="https://user-images.githubusercontent.com/19642016/85957562-446a8380-b943-11ea-913a-442cf7744083.png">
    
    <img width="1015" alt="Screen Shot 2020-06-28 at 1 28 29 PM" src="https://user-images.githubusercontent.com/19642016/85957566-4af8fb00-b943-11ea-8fef-a09c1d586772.png">
    
    ## Question
    
    For visual consistency, should we use back-ticks throughout the docs for these enum variants?
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    80e6489 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#73865 - LeSeulArtichaut:patch-1, r=Dylan-DPC

    Fix Zulip topic format
    
    Yet another instance of me making a mistake after copy-pasting :D
    r? @Dylan-DPC
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    187a6f4 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#73885 - pietroalbini:ci-fix-wasm32, r=kennytm

    Fix wasm32 being broken due to a NodeJS version bump
    
    Emscripten's SDK [recently bumped the version of NodeJS they shipped](emscripten-core/emsdk#529), but our Dockerfile for the wasm32 builder hardcoded the version number. This will cause consistent CI failures once the currently cached image is rebuilt (either due to a change or due to the cache expiring).
    
    This PR fixes the problem by finding the latest version of NodeJS in the Emscripten SDK and symlinking it to a "latest" directory, which is then added to the `PATH`.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    7927a05 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#73892 - GuillaumeGomez:cleanup-e0712, r=Dyl…

    …an-DPC
    
    Clean up E0712 explanation
    
    r? @Dylan-DPC
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    e4475fd View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#73898 - lcnr:issue61383, r=jonas-schievink

    remove duplicate test for rust-lang#61935
    
    Apparently I somehow messed up the issue number in rust-lang#67890
    which caused us to add this test twice, both as https://github.com/rust-lang/rust/blob/master/src/test/ui/const-generics/issues/issue-61935.rs and https://github.com/rust-lang/rust/blob/master/src/test/ui/const-generics/lazy-normalization/issue-71922.rs
    
    rust-lang#61935 is the actually fixed issue while rust-lang#71922 is still not working, as it depends on lazy norm of repeat expressions
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    e2f84f3 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#73909 - eltonlaw:unsafe-libstd-fs-rs, r=sfa…

    …ckler
    
    `#[deny(unsafe_op_in_unsafe_fn)]` in libstd/fs.rs
    
    The `libstd/fs.rs` part of rust-lang#73904 . Wraps the two calls to an unsafe fn `Initializer::nop()` in an `unsafe` block.
    
    Followed instructions in parent issue, ran `./x.py check src/libstd/` after adding the lint and two warnings were given. After adding these changes, those disappear.
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    c0cd0b9 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#73910 - cuviper:while-indexing, r=oli-obk

    Rewrite a few manual index loops with while-let
    
    There were a few instances of this pattern:
    
    ```rust
    while index < vec.len() {
        let item = &vec[index];
        // ...
    }
    ```
    
    These can be indexed at once:
    
    ```rust
    while let Some(item) = vec.get(index) {
        // ...
    }
    ```
    
    Particularly in `ObligationForest::process_obligations`, this mitigates
    a codegen regression found with LLVM 11 (rust-lang#73526).
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    385fa6b View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#73929 - kraai:fix-comment-typo, r=jonas-sch…

    …ievink
    
    Fix comment typo
    Manishearth committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    b5c5382 View commit details
    Browse the repository at this point in the history