[beta] Rollup backports #64097

pietroalbini · 2019-09-02T15:36:27Z

Rolled up:

[beta] Utilize released stable over dev-static [beta] Utilize released stable over dev-static #64046

Cherry picked:

Update rust-installer to limit memory use Update rust-installer to limit memory use #63984
debuginfo: give unique names to closure and generator types debuginfo: give unique names to closure and generator types #63875
ci: move libc mirrors to the rust-lang-ci-mirrors bucket ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772
Fix nested eager expansions in arguments of format_args Fix nested eager expansions in arguments of format_args #63717

Closure types have been moved to the namespace where they are defined, and both closure and generator type names now include the disambiguator. This fixes an exception when lldb prints nested closures. Fixes rust-lang#57822

Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.

…ng an expression Maybe it made sense when it was introduced, but now it's doing something incorrect.

…albini

pietroalbini · 2019-09-02T15:36:40Z

@bors r+ p=20

bors · 2019-09-02T15:36:41Z

📌 Commit 02c4da1 has been approved by pietroalbini

bors · 2019-09-02T19:12:31Z

⌛ Testing commit 02c4da1 with merge 4b9b956346a3cf02720852c98e51301184df05f3...

rust-highfive · 2019-09-02T22:07:02Z

The job x86_64-gnu-tools of your PR failed (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.

2019-09-02T22:04:51.7346736Z Requiring test passing for edition-guide...
2019-09-02T22:04:51.7346834Z Requiring test passing for rls...
2019-09-02T22:04:51.7347068Z Requiring test passing for rustfmt...
2019-09-02T22:04:51.7347787Z Requiring test passing for clippy-driver...
2019-09-02T22:04:52.2915342Z ##[error]Bash exited with code '4'.
2019-09-02T22:04:52.2948831Z ##[section]Starting: Upload CPU usage statistics
2019-09-02T22:04:52.2956479Z ==============================================================================
2019-09-02T22:04:52.2956565Z Task         : Bash
2019-09-02T22:04:52.2956646Z Description  : Run a Bash script on macOS, Linux, or Windows

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-09-02T22:07:19Z

💔 Test failed - checks-azure

pietroalbini · 2019-09-03T08:45:35Z

There is a clippy tests failure here.

2019-09-02T21:25:25.1150461Z thread '[ui] ui/format.rs' panicked at 'explicit panic', /cargo/registry/src/github.com-1ecc6299db9ec823/compiletest_rs-0.3.22/src/runtest.rs:2632:9
2019-09-02T21:25:25.1150578Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-02T21:25:25.1150642Z
2019-09-02T21:25:25.1150897Z ---- [ui] ui/unicode.rs stdout ----
2019-09-02T21:25:25.1150977Z normalized stderr:
2019-09-02T21:25:25.1151218Z error: zero-width space detected
2019-09-02T21:25:25.1151462Z --> $DIR/unicode.rs:3:12
2019-09-02T21:25:25.1151531Z |
2019-09-02T21:25:25.1151800Z LL | print!("Here >< is a ZWS, and another");
2019-09-02T21:25:25.1151910Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider replacing the string with: `"Here >/u{200B}< is a ZWS, and /u{200B}another"`
2019-09-02T21:25:25.1152016Z |
2019-09-02T21:25:25.1152293Z = note: `-D clippy::zero-width-space` implied by `-D warnings`
2019-09-02T21:25:25.1152359Z
2019-09-02T21:25:25.1152603Z error: non-nfc unicode sequence detected
2019-09-02T21:25:25.1152851Z --> $DIR/unicode.rs:9:12
2019-09-02T21:25:25.1152930Z |
2019-09-02T21:25:25.1153164Z LL | print!("̀àh?");
2019-09-02T21:25:25.1153456Z | ^^^^^ help: consider replacing the string with: `"̀àh?"`
2019-09-02T21:25:25.1153550Z |
2019-09-02T21:25:25.1153956Z = note: `-D clippy::unicode-not-nfc` implied by `-D warnings`
2019-09-02T21:25:25.1154013Z
2019-09-02T21:25:25.1154268Z error: literal non-ASCII character detected
2019-09-02T21:25:25.1154509Z --> $DIR/unicode.rs:15:12
2019-09-02T21:25:25.1154586Z |
2019-09-02T21:25:25.1154815Z LL | print!("Üben!");
2019-09-02T21:25:25.1154906Z | ^^^^^^^ help: consider replacing the string with: `"/u{dc}ben!"`
2019-09-02T21:25:25.1154987Z |
2019-09-02T21:25:25.1155268Z = note: `-D clippy::non-ascii-literal` implied by `-D warnings`
2019-09-02T21:25:25.1155323Z
2019-09-02T21:25:25.1155394Z error: aborting due to 3 previous errors
2019-09-02T21:25:25.1155440Z
2019-09-02T21:25:25.1155475Z
2019-09-02T21:25:25.1155518Z
2019-09-02T21:25:25.1155578Z expected stderr:
2019-09-02T21:25:25.1155835Z error: zero-width space detected
2019-09-02T21:25:25.1156076Z --> $DIR/unicode.rs:3:12
2019-09-02T21:25:25.1156156Z |
2019-09-02T21:25:25.1156415Z LL | print!("Here >< is a ZWS, and another");
2019-09-02T21:25:25.1156514Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-02T21:25:25.1156753Z |
2019-09-02T21:25:25.1157023Z = note: `-D clippy::zero-width-space` implied by `-D warnings`
2019-09-02T21:25:25.1157074Z
2019-09-02T21:25:25.1157294Z error: non-nfc unicode sequence detected
2019-09-02T21:25:25.1157519Z --> $DIR/unicode.rs:9:12
2019-09-02T21:25:25.1157581Z |
2019-09-02T21:25:25.1158159Z LL | print!("̀àh?");
2019-09-02T21:25:25.1158234Z | ^^^^^
2019-09-02T21:25:25.1158304Z |
2019-09-02T21:25:25.1158576Z = note: `-D clippy::unicode-not-nfc` implied by `-D warnings`
2019-09-02T21:25:25.1158636Z
2019-09-02T21:25:25.1158866Z error: literal non-ASCII character detected
2019-09-02T21:25:25.1159097Z --> $DIR/unicode.rs:15:12
2019-09-02T21:25:25.1159261Z |
2019-09-02T21:25:25.1159526Z LL | print!("Üben!");
2019-09-02T21:25:25.1159595Z | ^^^^^^^
2019-09-02T21:25:25.1159661Z |
2019-09-02T21:25:25.1159916Z = note: `-D clippy::non-ascii-literal` implied by `-D warnings`
2019-09-02T21:25:25.1159981Z
2019-09-02T21:25:25.1160049Z error: aborting due to 3 previous errors
2019-09-02T21:25:25.1160092Z
2019-09-02T21:25:25.1160131Z
2019-09-02T21:25:25.1160166Z
2019-09-02T21:25:25.1160223Z diff of stderr:
2019-09-02T21:25:25.1160272Z
2019-09-02T21:25:25.1160496Z error: zero-width space detected
2019-09-02T21:25:25.1160730Z --> $DIR/unicode.rs:3:12
2019-09-02T21:25:25.1160797Z |
2019-09-02T21:25:25.1161046Z LL | print!("Here >< is a ZWS, and another");
2019-09-02T21:25:25.1161295Z - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2019-09-02T21:25:25.1161566Z + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider replacing the string with: `"Here >/u{200B}< is a ZWS, and /u{200B}another"`
2019-09-02T21:25:25.1161666Z |
2019-09-02T21:25:25.1161926Z = note: `-D clippy::zero-width-space` implied by `-D warnings`
2019-09-02T21:25:25.1161999Z
2019-09-02T21:25:25.1162230Z error: non-nfc unicode sequence detected
2019-09-02T21:25:25.1162457Z --> $DIR/unicode.rs:9:12
2019-09-02T21:25:25.1162526Z |
2019-09-02T21:25:25.1162729Z LL | print!("̀àh?");
2019-09-02T21:25:25.1164047Z - | ^^^^^
2019-09-02T21:25:25.1164330Z + | ^^^^^ help: consider replacing the string with: `"̀àh?"`
2019-09-02T21:25:25.1164410Z |
2019-09-02T21:25:25.1164655Z = note: `-D clippy::unicode-not-nfc` implied by `-D warnings`
2019-09-02T21:25:25.1164733Z
2019-09-02T21:25:25.1164959Z error: literal non-ASCII character detected
2019-09-02T21:25:25.1165183Z --> $DIR/unicode.rs:15:12
2019-09-02T21:25:25.1165246Z |
2019-09-02T21:25:25.1165458Z LL | print!("Üben!");
2019-09-02T21:25:25.1165665Z - | ^^^^^^^
2019-09-02T21:25:25.1165762Z + | ^^^^^^^ help: consider replacing the string with: `"/u{dc}ben!"`
2019-09-02T21:25:25.1165837Z |
2019-09-02T21:25:25.1166092Z = note: `-D clippy::non-ascii-literal` implied by `-D warnings`
2019-09-02T21:25:25.1166165Z
2019-09-02T21:25:25.1166364Z error: aborting due to 3 previous errors

@rust-lang/clippy could any of you prepare a fix for it?

matthiaskrgr · 2019-09-03T08:49:41Z

Guess we need to cherry pick rust-lang/rust-clippy@4134e60 somewhere

pietroalbini · 2019-09-03T08:58:08Z

@matthiaskrgr sounds good! I recommend creating a rust-1.38.0 branch on the Clippy repo based off rust-lang/rust-clippy@72da101.

flip1995 · 2019-09-03T11:02:08Z

Done https://github.com/rust-lang/rust-clippy/tree/rust-1.38.0

pietroalbini · 2019-09-03T11:07:19Z

Thanks @flip1995

@bors r+ p=20

bors · 2019-09-03T11:07:19Z

📌 Commit 1b88d20b4da8a64c1ae7983681398914c222ce52 has been approved by pietroalbini

bors · 2019-09-03T12:23:25Z

⌛ Testing commit 1b88d20b4da8a64c1ae7983681398914c222ce52 with merge 501804235287da42a931843eec2c4b18aba67695...

bors · 2019-09-03T15:17:26Z

💔 Test failed - checks-azure

rust-highfive · 2019-09-03T15:17:27Z

The job x86_64-gnu-tools of your PR failed (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.

2019-09-03T15:15:54.8222710Z Verifying status of rustfmt...
2019-09-03T15:15:54.8235084Z Verifying status of clippy-driver...
2019-09-03T15:15:54.8248752Z This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
2019-09-03T15:15:54.8258834Z 
2019-09-03T15:15:54.8260624Z ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
2019-09-03T15:15:54.8262244Z 
2019-09-03T15:15:54.8262831Z If you do intend to update 'clippy-driver', please check the error messages above and
2019-09-03T15:15:54.8264579Z commit another update.
2019-09-03T15:15:54.8264719Z 
2019-09-03T15:15:54.8265388Z If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
2019-09-03T15:15:54.8266286Z change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
2019-09-03T15:15:54.8266405Z proper steps.
2019-09-03T15:15:55.4437959Z ##[error]Bash exited with code '3'.
2019-09-03T15:15:55.4482387Z ##[section]Starting: Upload CPU usage statistics
2019-09-03T15:15:55.4488908Z ==============================================================================
2019-09-03T15:15:55.4488999Z Task         : Bash
2019-09-03T15:15:55.4489087Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

flip1995 · 2019-09-03T16:09:21Z

Also cherry-picked rust-lang/rust-clippy#4439 on the rust-1.38.0 branch 👍 HEAD of rust-1.38.0 is rust-lang/rust-clippy@3aea860 now.

pietroalbini · 2019-09-03T18:21:39Z

@bors r+ p=20

bors · 2019-09-03T18:21:40Z

📌 Commit 5f51210 has been approved by pietroalbini

bors · 2019-09-03T19:17:35Z

⌛ Testing commit 5f51210 with merge d097af1...

@ghost

[beta] Rollup backports Rolled up: * [beta] Utilize released stable over dev-static #64046 Cherry picked: * Update rust-installer to limit memory use #63984 * debuginfo: give unique names to closure and generator types #63875 * ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772 * Fix nested eager expansions in arguments of `format_args` #63717 r? @ghost

bors · 2019-09-03T23:15:32Z

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing d097af1 to beta...

Mark-Simulacrum and others added 10 commits August 31, 2019 16:55

Use released stable for beta

15a07a8

Update rust-installer to limit memory use

a06cba2

debuginfo: give unique names to closure and generator types

7014774

Closure types have been moved to the namespace where they are defined, and both closure and generator type names now include the disambiguator. This fixes an exception when lldb prints nested closures. Fixes rust-lang#57822

debuginfo: always include disambiguator in type names

981dea5

ci: move libc mirrors to the rust-lang-ci-mirrors bucket

57f845c

Add a test for an opaque macro eagerly expanding its arguments

29fe076

Add a regression test for issue rust-lang#63460

1e77ef8

expand: Keep the correct current expansion ID for eager expansions

3d95d17

Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.

expand: Do not do questionable span adjustment before eagerly expandi…

f2e3031

…ng an expression Maybe it made sense when it was introduced, but now it's doing something incorrect.

Rollup merge of rust-lang#64046 - Mark-Simulacrum:beta-next, r=pietro…

02c4da1

…albini

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 2, 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 Sep 2, 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 Sep 3, 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 Sep 3, 2019

bump clippy

5f51210

pietroalbini force-pushed the beta-rollup branch from 1b88d20 to 5f51210 Compare September 3, 2019 18:21

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 Sep 3, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 3, 2019

bors merged commit 5f51210 into rust-lang:beta Sep 3, 2019

bors mentioned this pull request Sep 3, 2019

[beta] Utilize released stable over dev-static #64046

Merged

pnkfelix mentioned this pull request Sep 12, 2019

[1.38] Regression: cannot find macro trace! in this scope #63888

Closed

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

pietroalbini deleted the beta-rollup branch November 7, 2019 08:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[beta] Rollup backports #64097

[beta] Rollup backports #64097

pietroalbini commented Sep 2, 2019

pietroalbini commented Sep 2, 2019

bors commented Sep 2, 2019

bors commented Sep 2, 2019

rust-highfive commented Sep 2, 2019

bors commented Sep 2, 2019

pietroalbini commented Sep 3, 2019

matthiaskrgr commented Sep 3, 2019

pietroalbini commented Sep 3, 2019

flip1995 commented Sep 3, 2019

pietroalbini commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

rust-highfive commented Sep 3, 2019

flip1995 commented Sep 3, 2019 •

edited

Loading

pietroalbini commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

[beta] Rollup backports #64097

[beta] Rollup backports #64097

Conversation

pietroalbini commented Sep 2, 2019

pietroalbini commented Sep 2, 2019

bors commented Sep 2, 2019

bors commented Sep 2, 2019

rust-highfive commented Sep 2, 2019

bors commented Sep 2, 2019

pietroalbini commented Sep 3, 2019

matthiaskrgr commented Sep 3, 2019

pietroalbini commented Sep 3, 2019

flip1995 commented Sep 3, 2019

pietroalbini commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

rust-highfive commented Sep 3, 2019

flip1995 commented Sep 3, 2019 • edited Loading

pietroalbini commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

bors commented Sep 3, 2019

flip1995 commented Sep 3, 2019 •

edited

Loading