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 8 pull requests #73895

Closed
wants to merge 20 commits into from

Commits on Jun 26, 2020

  1. Merge pull request rust-lang#2 from rust-lang/master

    update master
    TyPR124 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    00ef461 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b71a3e1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    224bc05 View commit details
    Browse the repository at this point in the history
  4. Make likely and unlikely const

    They are gated by internal feature gate const_likely
    nbdd0121 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    fc239e8 View commit details
    Browse the repository at this point in the history
  5. Fix ICE for lib features

    nbdd0121 committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    779b05d 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. Update src/librustc_mir/interpret/intrinsics.rs

    Co-authored-by: Oliver Scherer <github35764891676564198441@oli-obk.de>
    nbdd0121 and oli-obk committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    8b43012 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. Configuration menu
    Copy the full SHA
    7231e57 View commit details
    Browse the repository at this point in the history
  2. 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
  3. Add newline to rustc MultiSpan docs

    Also adds back-ticks when referring to the contents of this collection.
    pierwill committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    4966272 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
  2. Configuration menu
    Copy the full SHA
    bb82e76 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. Rollup merge of rust-lang#73752 - TyPR124:invalid-parameter-error, r=…

    …LukasKalbertodt
    
    Remap Windows ERROR_INVALID_PARAMETER to ErrorKind::InvalidInput from Other
    
    I don't know if this is acceptable or how likely it is to break existing code, but it seem to me ERROR_INVALID_PARAMETER "The parameter is incorrect" should map to ErrorKind::InvalidInput "A parameter was incorrect". Previously this value fell through to ErrorKind::Other.
    
    I can't speak for anyone but myself, but I instinctively thought it would be InvalidInput.
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    bc9cfdf View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#73778 - nbdd0121:const_likely, r=oli-obk

    Make `likely` and `unlikely` const, gated by feature `const_unlikely`
    
    This PR also contains a fix to allow `#[allow_internal_unstable]` to work properly with `#[rustc_const_unstable]`.
    
    cc @RalfJung @nagisa
    
    r? @oli-obk
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    78dc3c8 View commit details
    Browse the repository at this point in the history
  3. 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.
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    0c6cc45 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#73828 - nop:fix/parameter-name-help, r=este…

    …bank
    
    Fix wording for anonymous parameter name help
    
    ```
     --> exercises/functions/functions2.rs:8:15
      |
    8 | fn call_me(num) {
      |               ^ expected one of `:`, `@`, or `|`
      |
      = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
    help: if this is a `self` type, give it a parameter name
      |
    8 | fn call_me(self: num) {
      |            ^^^^^^^^^
    help: if this was a parameter name, give it a type
      |
    8 | fn call_me(num: TypeName) {
      |            ^^^^^^^^^^^^^
    help: if this is a type, explicitly ignore the parameter name
      |
    8 | fn call_me(_: num) {
      |
    ```
    This commit changes "if this was a parameter name" to "if this is a parameter name" to match the wording of similar errors.
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    689ab25 View commit details
    Browse the repository at this point in the history
  5. 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?
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    101197a View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#73853 - pierwill:pierwill-multispan-doc, r=…

    …jonas-schievink
    
    Add newline to rustc MultiSpan docs
    
    Also adds back-ticks when referring to the contents of this collection.
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    61b3c2e View commit details
    Browse the repository at this point in the history
  7. 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
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    8b6fb50 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#73868 - ecstatic-morse:fix-stable-version, …

    …r=jonas-schievink
    
    Advertise correct stable version for const control flow
    
    rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
    Dylan-DPC committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    5f80061 View commit details
    Browse the repository at this point in the history