Rollup of 14 pull requests #58777

Centril · 2019-02-27T12:32:39Z

Successful merges:

Fix for issue #58050 #58075 (Fix for issue Mention 2015 edition in "note: ? is not a macro repetition operator" errors #58050)
rustdoc: move collapse and unindent docs passes earlier #58627 (rustdoc: move collapse and unindent docs passes earlier)
Make visit_clobber panic-safe. #58630 (Make visit_clobber panic-safe.)
Deny async fn in 2015 edition #58678 (Deny async fn in 2015 edition)
Fix an indexing error when using x.py help #58680 (Fix an indexing error when using x.py help)
Fix copy-pasted typo for read_string return value #58703 (Fix copy-pasted typo for read_string return value)
Update dlmalloc to 0.1.3 #58744 (Update dlmalloc to 0.1.3)
std: docs: Disable running several Stdio doctests #58746 (std: docs: Disable running several Stdio doctests)
update scoped_tls to 1.0 #58748 (update scoped_tls to 1.0)
Reduce Repetitions of (n << amt) >> amt #58749 (Reduce Repetitions of (n << amt) >> amt)
Update string_cache_codegen to 0.4.2 #58752 (Update string_cache_codegen to 0.4.2)
Clarify rotate_{left,right} docs #58755 (Clarify rotate_{left,right} docs)
Normalize the type Self resolves to in an impl #58757 (Normalize the type Self resolves to in an impl)
Add tracking issue for the unwind attribute #58761 (Add tracking issue for the unwind attribute)

Failed merges:

Fix style issues and update diagnostic messages Update src/librustc_passes/diagnostics.rs Co-Authored-By: doctorn <[email protected]> Deny nested `async fn` in Rust 2015 edition Deny nested `async fn` in Rust 2015 edition Deny nested `async fn` in Rust 2015 edition

* 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

I wondered what the `<<!` operator is although the exclamation mark was only the end of the sentence.

This is required at the very least in order to evaluate associated constants for arrays (see rust-lang#58212).

Signed-off-by: Adonis <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/libsyntax/ext/tt/quoted.rs Co-Authored-By: asettouf <[email protected]> Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf <[email protected]> Update src/test/ui/macros/macro-at-most-once-rep-2015-ques-rep.stderr Co-Authored-By: asettouf <[email protected]> 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 <[email protected]> Revert "Merge remote-tracking branch 'upstream/master'" This reverts commit 751f05bd155e2c55d4177fe8211df634faf3a644, reversing changes made to 545a3e62b0cb473108869a61b271bc589afb49da.

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.

@QuietMisdreavus

…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

@petrochenkov

…rochenkov Make `visit_clobber` panic-safe. Local measurements indicate the performance effect is negligible. r? @petrochenkov

@varkor

…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

…crichton Fix an indexing error when using `x.py help` Fixes rust-lang#58640.

Fix copy-pasted typo for read_string return value

@alexcrichton

…richton Update dlmalloc to 0.1.3 r? @alexcrichton

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

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

Reduce Repetitions of (n << amt) >> amt Fixes part of [rust-lang#49937](rust-lang#49937).

…, 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).

Clarify `rotate_{left,right}` docs I wondered what the `<<!` operator is although the exclamation mark was only the end of the sentence.

@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

…wind, r=Centril Add tracking issue for the unwind attribute cc rust-lang#58760

Centril · 2019-02-27T12:33:14Z

@bors r+ p=14

bors · 2019-02-27T12:33:15Z

📌 Commit 1394b6f has been approved by Centril

bors · 2019-02-27T15:15:21Z

⌛ Testing commit 1394b6f with merge b37c7a5a724397b11c9f3640b208982f45d5b234...

bors · 2019-02-27T15:50:13Z

💔 Test failed - checks-travis

rust-highfive · 2019-02-27T15:50:14Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

Attempting to download s3://rust-lang-ci-sccache2/docker/7e1a0f6dbf7ee5eb0f689d3f3f0b0c18b1a9c99aaacc2a649ce33a6db602dde1d880b783741255f4fb7da1afa8a7b1e7897822d59f692a8c90e11f791375e7c7
[00:01:57] Attempting with retry: curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache https://s3-us-west-1.amazonaws.com/rust-lang-ci-sccache2/docker/7e1a0f6dbf7ee5eb0f689d3f3f0b0c18b1a9c99aaacc2a649ce33a6db602dde1d880b783741255f4fb7da1afa8a7b1e7897822d59f692a8c90e11f791375e7c7
[00:01:57]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:01:57]                                  Dload  Upload   Total   Spent    Left  Speed
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Centril · 2019-02-27T15:51:54Z

@bors retry

cc #56112

bors · 2019-02-27T15:52:38Z

⌛ Testing commit 1394b6f with merge a4531627fa7c4b6054654dcc80a846ae08864f04...

bors · 2019-02-27T15:53:38Z

⌛ Testing commit 1394b6f with merge 592fa681ac56a7beb7c8a0f18d0c32a9d4874a8c...

rust-highfive · 2019-02-27T15:54:17Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

Cloning into 'rust-lang/rust'...
travis_time:end:051d72e5:start=1551282823031845882,finish=1551282829161324199,duration=6129478317
$ cd rust-lang/rust
$ git checkout -qf a4531627fa7c4b6054654dcc80a846ae08864f04
fatal: reference is not a tree: a4531627fa7c4b6054654dcc80a846ae08864f04
The command "git checkout -qf a4531627fa7c4b6054654dcc80a846ae08864f04" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

Centril · 2019-02-27T15:54:44Z

@bors retry

@ghost

Rollup of 14 pull requests Successful merges: - #58075 (Fix for issue #58050) - #58627 (rustdoc: move collapse and unindent docs passes earlier) - #58630 (Make `visit_clobber` panic-safe.) - #58678 (Deny `async fn` in 2015 edition) - #58680 (Fix an indexing error when using `x.py help`) - #58703 (Fix copy-pasted typo for read_string return value) - #58744 (Update dlmalloc to 0.1.3) - #58746 (std: docs: Disable running several Stdio doctests) - #58748 (update scoped_tls to 1.0) - #58749 (Reduce Repetitions of (n << amt) >> amt) - #58752 (Update string_cache_codegen to 0.4.2) - #58755 (Clarify `rotate_{left,right}` docs) - #58757 (Normalize the type Self resolves to in an impl) - #58761 (Add tracking issue for the unwind attribute) Failed merges: r? @ghost

bors · 2019-02-27T15:54:56Z

⌛ Testing commit 1394b6f with merge 7e001e5...

rust-highfive · 2019-02-27T15:56:10Z

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

Cloning into 'rust-lang/rust'...
travis_time:end:0b80e690:start=1551282920348052731,finish=1551282926400455527,duration=6052402796
$ cd rust-lang/rust
$ git checkout -qf 592fa681ac56a7beb7c8a0f18d0c32a9d4874a8c
fatal: reference is not a tree: 592fa681ac56a7beb7c8a0f18d0c32a9d4874a8c
The command "git checkout -qf 592fa681ac56a7beb7c8a0f18d0c32a9d4874a8c" failed and exited with 128 during .
Your build has been stopped.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-02-27T18:50:41Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 7e001e5 to master...

varkor and others added 30 commits February 23, 2019 18:57

Fix an indexing error when using x.py help

890ef48

move collapse and unindent docs passes earlier

906ec8a

merge early and late passes into single struct

1536852

Fix copy-pasted typo for read_string return value

f1b88ab

Update dlmalloc to 0.1.3

6c44bbb

Make visit_clobber panic-safe.

eddd07c

update scoped_tls to 1.0

5b97516

reduce repetitions of (n << amt) >> amt

992694a

update Cargo.lock

56fb287

Update string_cache_codegen to 0.4.2

6375efc

Clarify rotate_{left,right} docs

998896c

I wondered what the `<<!` operator is although the exclamation mark was only the end of the sentence.

Normalize the type Self resolves to in an impl

9b4055b

This is required at the very least in order to evaluate associated constants for arrays (see rust-lang#58212).

Add tracking issue for the unwind attribute.

f313bae

Rollup merge of rust-lang#58630 - nnethercote:fix-fold_clobber, r=pet…

a46b00e

…rochenkov Make `visit_clobber` panic-safe. Local measurements indicate the performance effect is negligible. r? @petrochenkov

Rollup merge of rust-lang#58680 - varkor:xpy-help-index-error, r=alex…

fed5610

…crichton Fix an indexing error when using `x.py help` Fixes rust-lang#58640.

Rollup merge of rust-lang#58703 - shepmaster:read_line_return, r=centril

115c8a1

Fix copy-pasted typo for read_string return value

Rollup merge of rust-lang#58744 - jethrogb:jb/dlmalloc-0.1.3, r=alexc…

5eadeed

…richton Update dlmalloc to 0.1.3 r? @alexcrichton

Rollup merge of rust-lang#58749 - kenta7777:reduce-repetition, r=oli-obk

851689c

Reduce Repetitions of (n << amt) >> amt Fixes part of [rust-lang#49937](rust-lang#49937).

Rollup merge of rust-lang#58752 - taiki-e:update-string_cache_codegen…

0c871fa

…, 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).

Rollup merge of rust-lang#58755 - tbu-:pr_doc_clarifyrotate, r=Centril

90cbf8e

Clarify `rotate_{left,right}` docs I wondered what the `<<!` operator is although the exclamation mark was only the end of the sentence.

Rollup merge of rust-lang#58757 - aoikonomopoulos:issue-58212, r=oli-obk

5910271

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

Rollup merge of rust-lang#58761 - Mark-Simulacrum:add-feature-gate-un…

1394b6f

…wind, r=Centril Add tracking issue for the unwind attribute cc rust-lang#58760

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 27, 2019

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 27, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 27, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 27, 2019

bors merged commit 1394b6f into rust-lang:master Feb 27, 2019

This was referenced Feb 27, 2019

Add support for using a jobserver with Rayon #56946

Merged

librustc_driver => 2018 #58253

Merged

rustdoc: add option to calculate "documentation coverage" #58626

Merged

Remove NodeId from more HIR nodes #58754

Merged

Centril deleted the rollup branch February 28, 2019 00:19

Centril added the rollup A PR which is a rollup label Oct 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #58777

Rollup of 14 pull requests #58777

Centril commented Feb 27, 2019

Centril commented Feb 27, 2019

bors commented Feb 27, 2019

bors commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

Centril commented Feb 27, 2019 •

edited

Loading

bors commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

Centril commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

bors commented Feb 27, 2019

Rollup of 14 pull requests #58777

Rollup of 14 pull requests #58777

Conversation

Centril commented Feb 27, 2019

Centril commented Feb 27, 2019

bors commented Feb 27, 2019

bors commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

Centril commented Feb 27, 2019 • edited Loading

bors commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

Centril commented Feb 27, 2019

bors commented Feb 27, 2019

rust-highfive commented Feb 27, 2019

bors commented Feb 27, 2019

Centril commented Feb 27, 2019 •

edited

Loading