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 6 pull requests #72403

Closed
wants to merge 14 commits into from

Commits on May 11, 2020

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

Commits on May 19, 2020

  1. Configuration menu
    Copy the full SHA
    ed84780 View commit details
    Browse the repository at this point in the history
  2. Break tokens before checking if they are 'probably equal'

    Fixes rust-lang#68489
    
    When checking two `TokenStreams` to see if they are 'probably equal',
    we ignore the `IsJoint` information associated with each `TokenTree`.
    However, the `IsJoint` information determines whether adjacent tokens
    will be 'glued' (if possible) when construction the `TokenStream` - e.g.
    `[Gt Gt]` can be 'glued' to `BinOp(Shr)`.
    
    Since we are ignoring the `IsJoint` information, 'glued' and 'unglued'
    tokens are equivalent for determining if two `TokenStreams` are
    'probably equal'. Therefore, we need to 'unglue' all tokens in the
    stream to avoid false negatives (which cause us to throw out the cached
    tokens, losing span information).
    Aaron1011 committed May 19, 2020
    Configuration menu
    Copy the full SHA
    9b2b8a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fdc4522 View commit details
    Browse the repository at this point in the history
  4. Use a fixed-point iteration when breaking tokens

    Some tokens need to be broken in a loop until we reach
    'unbreakable' tokens.
    Aaron1011 committed May 19, 2020
    Configuration menu
    Copy the full SHA
    4a8ccdc View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Suggest installing VS Build Tools in more situations

    When MSVC's `link.exe` wasn't found but another `link.exe` was, the error message given can be impenetrable to many users. The usual suspect is GNU's `link` tool. In this case, inform the user that they may need to install VS build tools.
    
    This only applies when Microsoft's link tool is expected. Not `lld-link` or other MSVC compatible linkers.
    ChrisDenton committed May 20, 2020
    Configuration menu
    Copy the full SHA
    2fd504c View commit details
    Browse the repository at this point in the history
  2. Fix tests

    Aaron1011 committed May 20, 2020
    Configuration menu
    Copy the full SHA
    633293f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c7813ff View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#72111 - petrochenkov:docstrip, r=ehuss

    rustc-book: Document `-Z strip=val` option
    
    cc rust-lang#72110
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    a8f9c34 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#72272 - GuillaumeGomez:fix-back-on-page-wit…

    …h-search-behaviour, r=kinnison
    
    Fix going back in history to a search result page on firefox
    
    This bug was actually firefox not re-running JS script when you go back in history. To trigger it on the current docs:
    
     * Make a search
     * Pick an element (which isn't on the same page as the current element!)
     * Go back in history
    
    Instead of having the search results, you'll see the normal doc page. You can find a small explanation about it [here](http://web.archive.org/web/20100428053932/http://www.firefoxanswer.com/firefox/672-firefoxanswer.html).
    
    r? @kinnison
    
    cc @ollie27
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    daed2a2 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#72296 - ChrisDenton:msvc-link-check, r=petr…

    …ochenkov
    
    Suggest installing VS Build Tools in more situations
    
    When MSVC's `link.exe` wasn't found but another `link.exe` was, the error message given can be [impenetrable](https://pastebin.com/MRMCr7HM) to many users. The usual suspect is GNU's `link` tool. In this case, inform the user that they may need to install VS build tools.
    
    This only applies when Microsoft's link tool is expected.
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    660dea1 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#72306 - Aaron1011:feature/turbo-spacing, r=…

    …petrochenkov
    
    Break tokens before checking if they are 'probably equal'
    
    Fixes rust-lang#68489
    Fixes rust-lang#70987
    
    When checking two `TokenStreams` to see if they are 'probably equal',
    we ignore the `IsJoint` information associated with each `TokenTree`.
    However, the `IsJoint` information determines whether adjacent tokens
    will be 'glued' (if possible) when construction the `TokenStream` - e.g.
    `[Gt Gt]` can be 'glued' to `BinOp(Shr)`.
    
    Since we are ignoring the `IsJoint` information, 'glued' and 'unglued'
    tokens are equivalent for determining if two `TokenStreams` are
    'probably equal'. Therefore, we need to 'unglue' all tokens in the
    stream to avoid false negatives (which cause us to throw out the cached
    tokens, losing span information).
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    63487fc View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#72365 - marmeladema:remove-node_to_hir_id, …

    …r=ecstatic-morse
    
    Remove unused `StableHashingContext::node_to_hir_id` method
    
    cc rust-lang#50928
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    f199439 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#72397 - petrochenkov:tiny, r=Amanieu

    llvm: Expose tiny code model to users
    
    This model is relevant to embedded AArch64 targets and was added to LLVM relatively recently (https://reviews.llvm.org/D49673, mid 2018), so rustc frontend didn't provide access to it with `-C code-model`. The gcc analogue is [`-mcmodel=tiny`](https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html).
    (This is one of the options that are passed directly to LLVM without being interpreted by rustc.)
    
    Follow up to rust-lang#72248.
    Dylan-DPC authored May 20, 2020
    Configuration menu
    Copy the full SHA
    9ea519f View commit details
    Browse the repository at this point in the history