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 14 pull requests #58777

Merged
merged 30 commits into from
Feb 27, 2019
Merged

Rollup of 14 pull requests #58777

merged 30 commits into from
Feb 27, 2019

Commits on Feb 23, 2019

  1. Configuration menu
    Copy the full SHA
    890ef48 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    906ec8a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1536852 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2019

  1. Deny async fn in 2015 edition

    Fix style issues and update diagnostic messages
    
    Update src/librustc_passes/diagnostics.rs
    
    Co-Authored-By: doctorn <me@nathancorbyn.com>
    
    Deny nested `async fn` in Rust 2015 edition
    
    Deny nested `async fn` in Rust 2015 edition
    
    Deny nested `async fn` in Rust 2015 edition
    doctorn committed Feb 24, 2019
    Configuration menu
    Copy the full SHA
    8300f51 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2019

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

Commits on Feb 26, 2019

  1. Update dlmalloc to 0.1.3

    Jethro Beekman committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    6c44bbb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eddd07c View commit details
    Browse the repository at this point in the history
  3. Disable running several Stdio doctests

    * A number of `Stdio` related doc examples include running the "rev"
    command to illustrate piping commands. The majority of these tests are
    marked as `no_run` except for two tests which were not
    * Not running these tests is unlikely to cause any negative impact, and
    doing so also allows the test suite to pass in environments where the
    "rev" command is unavailable
    ipetkov committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    abd88a9 View commit details
    Browse the repository at this point in the history
  4. update scoped_tls to 1.0

    Marcel Hellwig committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    5b97516 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    992694a View commit details
    Browse the repository at this point in the history
  6. update Cargo.lock

    hellow554 committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    56fb287 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6375efc View commit details
    Browse the repository at this point in the history
  8. Clarify rotate_{left,right} docs

    I wondered what the `<<!` operator is although the exclamation mark was
    only the end of the sentence.
    tbu- committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    998896c View commit details
    Browse the repository at this point in the history
  9. Normalize the type Self resolves to in an impl

    This is required at the very least in order to evaluate associated
    constants for arrays (see rust-lang#58212).
    Angelos Oikonomopoulos committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    9b4055b View commit details
    Browse the repository at this point in the history
  10. Changing error message to reflect changes with the 2018 edition

    Signed-off-by: Adonis <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Stabilize split_ascii_whitespace
    
    Tracking issue FCP to merge: rust-lang#48656 (comment)
    
    fix stabilization order of uniform_paths.
    
    hir: add HirId to main Hir nodes
    
    Fix `std::os::fortanix_sgx::usercalls::raw::UsercallNrs`
    
    Fixes fortanix/rust-sgx#88
    
    Update src/libsyntax/ext/tt/quoted.rs
    
    Co-Authored-By: asettouf <adonis.settouf@gmail.com>
    
    Revert "Merge remote-tracking branch 'upstream/master'"
    
    This reverts commit 751f05bd155e2c55d4177fe8211df634faf3a644, reversing
    changes made to 545a3e62b0cb473108869a61b271bc589afb49da.
    asettouf committed Feb 26, 2019
    Configuration menu
    Copy the full SHA
    c1f3d15 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    f313bae View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Rollup merge of rust-lang#58075 - asettouf:master, r=varkor

    Fix for issue  rust-lang#58050
    
    Hi,
    
    a quick PR to mention in the compiler error message that `?` is a macro operator, as according to issue rust-lang#58050
    
    It passed `python x.py test src/tools/tidy`  locally, as well as the recommendation to run `/x.py test src/test/ui --stage 1 --bless`.
    
    Let me know if anything else is needed.
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    2f58c2c View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#58627 - euclio:rustdoc-pass-order, r=QuietM…

    …isdreavus
    
    rustdoc: move collapse and unindent docs passes earlier
    
    Moves these passes as early as possible so later passes will see the same markdown that is passed to the test collector.
    
    Fixes rust-lang#58473, and a similar issue with the private-doc-tests lint.
    
    r? @QuietMisdreavus
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    f6673a4 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#58630 - nnethercote:fix-fold_clobber, r=pet…

    …rochenkov
    
    Make `visit_clobber` panic-safe.
    
    Local measurements indicate the performance effect is negligible.
    
    r? @petrochenkov
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    a46b00e View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#58678 - doctorn:refuse-async-fn-2015-editio…

    …n, r=varkor
    
    Deny `async fn` in 2015 edition
    
    This commit prevents code using `async fn` from being compiled in Rust 2015 edition.
    
    Compiling code of the form:
    
    ```rust
    async fn foo() {}
    ```
    
    Will now result in the error:
    
    ```
    error[E0670]: `async fn` is not permitted in the 2015 edition
     --> async.rs:1:1
      |
    1 | async fn foo() {}
      | ^^^^^
    
    error: aborting due to error
    
    For more information about an error, try `rustc --explain E0670`.
    ```
    
    This resolves rust-lang#58652 and also resolves rust-lang#53714.
    
    r? @varkor
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    f84a8cf View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#58680 - varkor:xpy-help-index-error, r=alex…

    …crichton
    
    Fix an indexing error when using `x.py help`
    
    Fixes rust-lang#58640.
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    fed5610 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#58703 - shepmaster:read_line_return, r=centril

    Fix copy-pasted typo for read_string return value
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    115c8a1 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#58744 - jethrogb:jb/dlmalloc-0.1.3, r=alexc…

    …richton
    
    Update dlmalloc to 0.1.3
    
    r? @alexcrichton
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    5eadeed View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#58746 - ipetkov:std-process-docs, r=cramertj

    std: docs: Disable running several Stdio doctests
    
    * A number of `Stdio` related doc examples include running the "rev"
    command to illustrate piping commands. The majority of these tests are
    marked as `no_run` except for two tests which were not
    * Not running these tests is unlikely to cause any negative impact, and
    doing so also allows the test suite to pass in environments where the
    "rev" command is unavailable
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    c0c7d59 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#58748 - hellow554:scoped_tls, r=estebank

    update scoped_tls to 1.0
    
    scoped_tls has been updated to version 1.0
    This PR will hopefully merge flawlessly :)
    
    This fixes, among others, alexcrichton/scoped-tls#9
    
    Note, that the nightly feature has been removed in alexcrichton/scoped-tls@64bd7b8
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    a20c2fd View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#58749 - kenta7777:reduce-repetition, r=oli-obk

    Reduce Repetitions of (n << amt) >> amt
    
    Fixes part of [rust-lang#49937](rust-lang#49937).
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    851689c View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#58752 - taiki-e:update-string_cache_codegen…

    …, r=alexcrichton
    
    Update string_cache_codegen to 0.4.2
    
    This removes two dependencies of the old version (string_cache is already the latest version).
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    0c871fa View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#58755 - tbu-:pr_doc_clarifyrotate, r=Centril

    Clarify `rotate_{left,right}` docs
    
    I wondered what the `<<!` operator is although the exclamation mark was
    only the end of the sentence.
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    90cbf8e View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#58757 - aoikonomopoulos:issue-58212, r=oli-obk

    Normalize the type Self resolves to in an impl
    
    This is required at the very least in order to evaluate associated
    constants for arrays.
    
    Fixes rust-lang#57796
    Fixes rust-lang#58212.
    
    r? @oli-obk
    cc @hellow554
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    5910271 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#58761 - Mark-Simulacrum:add-feature-gate-un…

    …wind, r=Centril
    
    Add tracking issue for the unwind attribute
    
    cc rust-lang#58760
    Centril committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    1394b6f View commit details
    Browse the repository at this point in the history