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

[beta] Rollup backports #64097

Merged
merged 11 commits into from Sep 3, 2019

Conversation

@pietroalbini
Copy link
Member

commented Sep 2, 2019

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

Mark-Simulacrum and others added 10 commits Aug 31, 2019
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 #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.
@pietroalbini

This comment has been minimized.

Copy link
Member Author

commented Sep 2, 2019

@bors r+ p=20

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 2, 2019

📌 Commit 02c4da1 has been approved by pietroalbini

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 2, 2019

⌛️ Testing commit 02c4da1 with merge 4b9b956...

bors added a commit that referenced this pull request Sep 2, 2019
[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
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Sep 2, 2019

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

This comment has been minimized.

Copy link
Contributor

commented Sep 2, 2019

💔 Test failed - checks-azure

@pietroalbini

This comment has been minimized.

Copy link
Member Author

commented Sep 3, 2019

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!("̀à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!("̀à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!("̀à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

This comment has been minimized.

Copy link
Member

commented Sep 3, 2019

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

@pietroalbini

This comment has been minimized.

Copy link
Member Author

commented Sep 3, 2019

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

@flip1995

This comment has been minimized.

@pietroalbini

This comment has been minimized.

Copy link
Member Author

commented Sep 3, 2019

Thanks @flip1995

@bors r+ p=20

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

📌 Commit 1b88d20 has been approved by pietroalbini

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

⌛️ Testing commit 1b88d20 with merge 5018042...

bors added a commit that referenced this pull request Sep 3, 2019
[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

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

💔 Test failed - checks-azure

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Sep 3, 2019

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

This comment has been minimized.

Copy link
Member

commented Sep 3, 2019

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 pietroalbini force-pushed the pietroalbini:beta-rollup branch from 1b88d20 to 5f51210 Sep 3, 2019
@pietroalbini

This comment has been minimized.

Copy link
Member Author

commented Sep 3, 2019

@bors r+ p=20

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

📌 Commit 5f51210 has been approved by pietroalbini

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

⌛️ Testing commit 5f51210 with merge d097af1...

bors added a commit that referenced this pull request Sep 3, 2019
[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

This comment has been minimized.

Copy link
Contributor

commented Sep 3, 2019

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

@bors bors added the merged-by-bors label Sep 3, 2019
@bors bors merged commit 5f51210 into rust-lang:beta Sep 3, 2019
1 check passed
1 check passed
homu Test successful
Details
@Centril Centril added the rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.