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 8 pull requests #62538

Closed
wants to merge 20 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 9, 2019

Successful merges:

Failed merges:

r? @ghost

Alexander Regueiro and others added 20 commits July 6, 2019 03:31
TIL that debug_assert is implemented using `if cfg!(debug_assertions)`
rather than `#[cfg(debug_assertions)]`. This means one can not use API
gated with `#[cfg(debug_assertions)]` in `debug_assert` family of
macros.
Co-Authored-By: Mazdak Farrokhzad <[email protected]>
…nkfelix

Fix ICEs when `Self` is used in type aliases

I think it is right just to disallow this at resolution stage rather than let typeck produce a cyclic error. This is in line with previous behaviour. There was probably no need at all for the change that introduced this bug in rust-lang#57428, so I've simply reversed it.

Fixes rust-lang#62263, rust-lang#62364, rust-lang#62305.

r? @eddyb
Raise the default recursion limit to 128

The previous limit of 64 is being (just) barely hit by genuine code out there, which is causing issues like rust-lang#62059 to rear their end.

Ideally, we wouldn’t have such arbitrary limits at all, but while we do, it makes a lot of sense to just raise this limit whenever genuine use-cases end up hitting it.

r? @pnkfelix

Fixes rust-lang#62059
Prevent shrinking of "crate select" element on Firefox

This fixes rust-lang#60368
cli: make help output for -l and -L consistent
…crichton

Regression test for HRTB bug (issue 30786).

Close rust-lang#30786.
…crichton

Regression test for issue 42574.

Cc rust-lang#42574.

I'm not going to say this *closes* that issue yet, for two reasons:

 1. I am still confused about some aspects of the behavior we are observing that bug

 2. The "fix" to the diagnostic relies on full NLL (`#![feature(nll)]`); migration mode still has a subpar diagnostic.
…_compiler_messages_p4, r=Centril

normalize use of backticks in compiler messages for libsyntax/feature_gate.rs

rust-lang#60532
clarify that debug_assert does not completely omits the code

TIL that debug_assert is implemented using `if cfg!(debug_assertions)`
rather than `#[cfg(debug_assertions)]`. This means one can not use API
gated with `#[cfg(debug_assertions)]` in `debug_assert` family of
macros.
@Centril
Copy link
Contributor Author

Centril commented Jul 9, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Jul 9, 2019

📌 Commit ea48605 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 9, 2019
@bors
Copy link
Contributor

bors commented Jul 9, 2019

⌛ Testing commit ea48605 with merge 043bb8c1b482614a15b83810377248344cb4eb62...

@bors
Copy link
Contributor

bors commented Jul 9, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job Job36 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-07-09T16:55:43.7546801Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-09T16:55:43.7546854Z 
2019-07-09T16:55:43.7547081Z   git checkout -b <new-branch-name>
2019-07-09T16:55:43.7547151Z 
2019-07-09T16:55:43.7547434Z HEAD is now at 043bb8c1b Auto merge of #62538 - Centril:rollup-qdenlwf, r=Centril
2019-07-09T16:55:43.7609872Z ##[section]Starting: Collect CPU-usage statistics in the background
2019-07-09T16:55:43.7613106Z ==============================================================================
2019-07-09T16:55:43.7613197Z Task         : Bash
2019-07-09T16:55:43.7613307Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-07-09T18:28:08.0909711Z test [ui] ui/type-alias-enum-variants/issue-57866.rs ... ok
2019-07-09T18:28:08.1398354Z test [ui] ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs ... ok
2019-07-09T18:28:08.1579383Z test [ui] ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs ... ok
2019-07-09T18:28:08.1822814Z test [ui] ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs ... ok
2019-07-09T18:28:08.2257946Z test [ui] ui/type-alias/issue-62263-self-in-atb.rs ... ok
2019-07-09T18:28:08.2680860Z test [ui] ui/type-alias/issue-62305-self-assoc-ty.rs ... ok
2019-07-09T18:28:08.3134776Z test [ui] ui/type-alias/issue-62364-self-ty-arg.rs ... ok
2019-07-09T18:28:08.4745575Z test [ui] ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs ... ok
2019-07-09T18:28:08.5264493Z test [ui] ui/type/type-arg-out-of-scope.rs ... ok
2019-07-09T18:28:08.5264989Z test [ui] ui/type/type-annotation-needed.rs ... ok
2019-07-09T18:28:08.5731150Z test [ui] ui/type/type-ascription-instead-of-statement-end.rs ... ok
---
2019-07-09T18:32:14.4844694Z test [ui (nll)] ui/type-alias-enum-variants/issue-57866.rs ... ok
2019-07-09T18:32:14.5306084Z test [ui (nll)] ui/type-alias-enum-variants/no-type-application-on-aliased-enum-variant.rs ... ok
2019-07-09T18:32:14.5522268Z test [ui (nll)] ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs ... ok
2019-07-09T18:32:14.5732528Z test [ui (nll)] ui/type-alias-enum-variants/resolve-to-enum-variant-in-type-namespace-and-error.rs ... ok
2019-07-09T18:32:14.6138555Z test [ui (nll)] ui/type-alias/issue-62263-self-in-atb.rs ... ok
2019-07-09T18:32:14.6557612Z test [ui (nll)] ui/type-alias/issue-62305-self-assoc-ty.rs ... ok
2019-07-09T18:32:14.7011102Z test [ui (nll)] ui/type-alias/issue-62364-self-ty-arg.rs ... ok
2019-07-09T18:32:14.8712131Z test [ui (nll)] ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs ... ok
2019-07-09T18:32:14.9086532Z test [ui (nll)] ui/type/type-annotation-needed.rs ... ok
2019-07-09T18:32:14.9300003Z test [ui (nll)] ui/type/type-arg-out-of-scope.rs ... ok
2019-07-09T18:32:14.9555062Z test [ui (nll)] ui/type/type-ascription-instead-of-initializer.rs ... ok
---
2019-07-09T18:32:26.9002212Z 
2019-07-09T18:32:26.9002829Z ---- [ui (nll)] ui/hrtb/issue-30786.rs stdout ----
2019-07-09T18:32:26.9002931Z diff of stderr:
2019-07-09T18:32:26.9002972Z 
2019-07-09T18:32:26.9003275Z - error: implementation of `Stream` is not general enough
2019-07-09T18:32:26.9003526Z -   --> $DIR/issue-30786.rs:98:22
2019-07-09T18:32:26.9003774Z + error: higher-ranked subtype error
2019-07-09T18:32:26.9004006Z +   --> $DIR/issue-30786.rs:103:18
2019-07-09T18:32:26.9004089Z 3    |
2019-07-09T18:32:26.9004328Z - LL |     let map = source.map(|x: &_| x);
2019-07-09T18:32:26.9004578Z -    |                      ^^^
2019-07-09T18:32:26.9004650Z + LL |     let filter = map.filter(|x: &_| true);
2019-07-09T18:32:26.9004806Z + 
2019-07-09T18:32:26.9004806Z + 
2019-07-09T18:32:26.9005044Z + error: higher-ranked subtype error
2019-07-09T18:32:26.9005272Z +   --> $DIR/issue-30786.rs:104:17
2019-07-09T18:32:26.9005356Z 6    |
2019-07-09T18:32:26.9005714Z -    = note: `Stream` would have to be implemented for the type `&'0 mut Map<Repeat, [closure@$DIR/issue-30786.rs:98:26: 98:35]>`, for any lifetime `'0`
2019-07-09T18:32:26.9006154Z -    = note: but `Stream` is actually implemented for the type `&'1 mut Map<Repeat, [closure@$DIR/issue-30786.rs:98:26: 98:35]>`, for some specific lifetime `'1`
2019-07-09T18:32:26.9006289Z + LL |     let count = filter.count(); // Assert that we still have a valid stream.
2019-07-09T18:32:26.9006457Z 9 
2019-07-09T18:32:26.9006680Z - error: aborting due to previous error
2019-07-09T18:32:26.9006766Z + error: aborting due to 2 previous errors
2019-07-09T18:32:26.9006829Z 11 
2019-07-09T18:32:26.9006829Z 11 
2019-07-09T18:32:26.9006903Z 12 
2019-07-09T18:32:26.9006937Z 
2019-07-09T18:32:26.9007147Z 
2019-07-09T18:32:26.9007231Z The actual stderr differed from the expected stderr.
2019-07-09T18:32:26.9007861Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hrtb/issue-30786.nll/issue-30786.nll.stderr
2019-07-09T18:32:26.9008196Z To update references, rerun the tests and pass the `--bless` flag
2019-07-09T18:32:26.9008491Z To only update this specific test, also pass `--test-args hrtb/issue-30786.rs`
2019-07-09T18:32:26.9008629Z error: 1 errors occurred comparing output.
2019-07-09T18:32:26.9008715Z status: exit code: 1
2019-07-09T18:32:26.9008715Z status: exit code: 1
2019-07-09T18:32:26.9009778Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/hrtb/issue-30786.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hrtb/issue-30786.nll" "-Zborrowck=mir" "-Crpath" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/hrtb/issue-30786.nll/auxiliary" "-A" "unused"
2019-07-09T18:32:26.9010349Z ------------------------------------------
2019-07-09T18:32:26.9010518Z 
2019-07-09T18:32:26.9010942Z ------------------------------------------
2019-07-09T18:32:26.9011031Z stderr:
2019-07-09T18:32:26.9011031Z stderr:
2019-07-09T18:32:26.9011251Z ------------------------------------------
2019-07-09T18:32:26.9011492Z error: higher-ranked subtype error
2019-07-09T18:32:26.9011737Z   --> /checkout/src/test/ui/hrtb/issue-30786.rs:103:18
2019-07-09T18:32:26.9011825Z    |
2019-07-09T18:32:26.9011888Z LL |     let filter = map.filter(|x: &_| true);
2019-07-09T18:32:26.9012028Z 
2019-07-09T18:32:26.9012028Z 
2019-07-09T18:32:26.9012263Z error: higher-ranked subtype error
2019-07-09T18:32:26.9012510Z   --> /checkout/src/test/ui/hrtb/issue-30786.rs:104:17
2019-07-09T18:32:26.9012595Z    |
2019-07-09T18:32:26.9012665Z LL |     let count = filter.count(); // Assert that we still have a valid stream.
2019-07-09T18:32:26.9012808Z 
2019-07-09T18:32:26.9012883Z error: aborting due to 2 previous errors
2019-07-09T18:32:26.9012935Z 
2019-07-09T18:32:26.9012967Z 
---
2019-07-09T18:32:26.9021006Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:535:22
2019-07-09T18:32:26.9021146Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-07-09T18:32:26.9036684Z 
2019-07-09T18:32:26.9036813Z 
2019-07-09T18:32:26.9039580Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "8.0.0-rust-1.38.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" "--compare-mode" "nll"
2019-07-09T18:32:26.9040467Z 
2019-07-09T18:32:26.9040526Z 
2019-07-09T18:32:26.9043769Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-07-09T18:32:26.9043886Z Build completed unsuccessfully in 1:32:15
2019-07-09T18:32:26.9043886Z Build completed unsuccessfully in 1:32:15
2019-07-09T18:32:28.0288596Z ##[error]Bash exited with code '1'.
2019-07-09T18:32:28.0386644Z ##[section]Starting: Upload CPU usage statistics
2019-07-09T18:32:28.0393520Z ==============================================================================
2019-07-09T18:32:28.0393630Z Task         : Bash
2019-07-09T18:32:28.0393697Z 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 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 Jul 9, 2019
@Centril Centril closed this Jul 9, 2019
@Centril Centril deleted the rollup-qdenlwf branch July 9, 2019 18:59
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants