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 18 pull requests #76422

Merged
merged 38 commits into from
Sep 7, 2020
Merged

Rollup of 18 pull requests #76422

merged 38 commits into from
Sep 7, 2020

Commits on Sep 3, 2020

  1. Configuration menu
    Copy the full SHA
    3e29fdb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    791f93c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2278c72 View commit details
    Browse the repository at this point in the history
  4. Make Ipv4Addr and Ipv6Addr const tests unit tests under library

    These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.
    CDirkx committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    a2e077e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8c93125 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7b823df View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. Move various ui const tests to library

    Move:
     - `src\test\ui\consts\const-nonzero.rs` to `library\core`
     - `src\test\ui\consts\ascii.rs` to `library\core`
     - `src\test\ui\consts\cow-is-borrowed` to `library\alloc`
    
    Part of rust-lang#76268
    CDirkx committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    538e198 View commit details
    Browse the repository at this point in the history
  2. Remove a useless allowed attr

    tesuji committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    a3ee65f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8f11127 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fac2726 View commit details
    Browse the repository at this point in the history
  5. Move Vec slice UI tests in library

    Ayush Kumar Mishra committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    d16bbd1 View commit details
    Browse the repository at this point in the history
  6. Implementation of incompatible features error

    If two features are defined as incompatible, using them together would
    result in an error
    Amjad50 committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    8f2d906 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2ed1a21 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    bcfd15b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    85b11d5 View commit details
    Browse the repository at this point in the history
  10. Fix nlink example typo

    gillespiecd committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    5456414 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    59e3733 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2020

  1. Indent a note to make folding work nicer

    Co-authored-by: Joshua Nelson <[email protected]>
    tesuji and Joshua Nelson committed Sep 5, 2020
    Configuration menu
    Copy the full SHA
    dfd219d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4806e0a View commit details
    Browse the repository at this point in the history
  3. Disable atomics on avr target.

    `max_atomic_width` was missing in the spec, which means it fell back to
    the pointer width of 16 bits.
    m-ou-se committed Sep 5, 2020
    Configuration menu
    Copy the full SHA
    61ac138 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2020

  1. Rollup merge of rust-lang#76273 - CraftSpider:master, r=matklad

    Move some Vec UI tests into alloc unit tests
    
    A bit of work towards rust-lang#76268, makes a number of the Vec UI tests that are simply running code into unit tests. Ensured that they are being run when testing liballoc locally.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    e488c4f View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#76274 - scottmcm:fix-76271, r=petrochenkov

    Allow try blocks as the argument to return expressions
    
    Fixes rust-lang#76271
    
    I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    6545985 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#76287 - lzutao:rm-allowed, r=jyn514

    Remove an unnecessary allowed lint
    
    It is outdated.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    7ad2b3a View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#76293 - Amjad50:incompatible_features_error…

    …, r=lcnr
    
    Implementation of incompatible features error
    
    Proposal of a new error: Incompatible features
    
    This error should happen if two features which are not compatible are used together.
    
    For now the only incompatible features are `const_generics` and `min_const_generics`
    
    fixes rust-lang#76280
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    3d834bc View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#76299 - CDirkx:ip-tests, r=matklad

    Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library`
    
    These tests are about the standard library, not the compiler itself, thus should live in `library`, see rust-lang#76268.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    2c62189 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#76302 - jyn514:peekable-2, r=Dylan-DPC

    Address review comments on `Peekable::next_if`
    
    r? @pickfire
    See rust-lang#72310 (review) for context.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    ee840db View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#76303 - jyn514:vec-assert-doc, r=Dylan-DPC

    Link to `#capacity-and-reallocation` when using with_capacity
    
    Follow up to rust-lang#76058 (comment).
    r? @pickfire
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    5b8f76d View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#76305 - CDirkx:const-tests, r=matklad

    Move various ui const tests to `library`
    
    Move:
     - `src\test\ui\consts\const-nonzero.rs` to `library\core`
     - `src\test\ui\consts\ascii.rs` to `library\core`
     - `src\test\ui\consts\cow-is-borrowed` to `library\alloc`
    
    Part of rust-lang#76268
    
    r? @matklad
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    52d9162 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#76309 - lzutao:indent-note, r=jyn514

    Indent a note to make folding work nicer
    
    Sublime Text folds code based on indentation. It maybe an unnecessary change, but does it look nicer after that ?
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    8ff13f4 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#76312 - numbermaniac:patch-1, r=shepmaster

    time.rs: Make spelling of "Darwin" consistent
    
    On line 89 of this file, the OS name is written as "Darwin", but on line 162 it is written in all-caps. Darwin is usually spelt as a standard proper noun, i.e. "Darwin", rather than in all-caps.
    
    This change makes that form consistent in both places.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    e735247 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#76318 - scottmcm:one-control-flow, r=ecstat…

    …ic-morse
    
    Use ops::ControlFlow in rustc_data_structures::graph::iterate
    
    Since I only know about this because you mentioned it,
    r? @ecstatic-morse
    
    If we're not supposed to use new `core` things in compiler for a while then feel free to close, but it felt reasonable to merge the two types since they're the same, and it might be convenient for people to use `?` in their traversal code.
    
    (This doesn't do the type parameter swap; NoraCodes has signed up to do that one.)
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    acd33e1 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#76324 - ayushmishra2005:move_vec_tests_in_l…

    …ibrary, r=matklad
    
    Move Vec slice UI tests in library
    
    Moved some of Vec slice UI tests in Library as a part of rust-lang#76268
    
    r? @matklad
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    1b24f14 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#76338 - euclio:intra-link-iterator, r=jyn514

    add some intra-doc links to `Iterator`
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    9f69a23 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    1db9290 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#76344 - camelid:patch-6, r=KodrAus

    Improve docs for `std::env::args()`
    
    @rustbot modify labels: T-doc
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    346d54d View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#76346 - gillespiecd:nlinks-docs, r=Dylan-DPC

    Docs: nlink example typo
    
    Small typo fix for the `nlink` function, extra whitespace before the `use` declaration
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    d444913 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#76358 - Wilfred:patch-3, r=lcnr

    Minor grammar fix in doc comment for soft-deprecated methods
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    5d89259 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#76364 - fusion-engineering-forks:avr-no-ato…

    …mic, r=jonas-schievink
    
    Disable atomics on avr target.
    
    `max_atomic_width` was missing in the spec, which means it fell back to the pointer width of 16 bits.
    
    Fixes rust-lang#76363.
    Dylan-DPC authored Sep 6, 2020
    Configuration menu
    Copy the full SHA
    23f8dd1 View commit details
    Browse the repository at this point in the history