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

Bugfix/rfc 2451 rerebalance tests #64546

Merged
merged 8 commits into from
Sep 29, 2019

Conversation

weiznich
Copy link
Contributor

r? @nikomatsakis

Fixes #64412
Depends/Contains on #64414

cc #55437 and #63599

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 17, 2019
@nikomatsakis
Copy link
Contributor

Thanks @weiznich! This looks good to me. I think we might want to add some more tests that show what happens when fundamental is used in a few more positions. Something like:

  • impl<T> Trait<Box<T>, Local> for u32 { } -- expect error
  • impl<T> Trait<Box<T>> for Local { } -- expect OK
  • impl<T> Trait<Local> for Vec<Box<T>> { } -- expect OK, just as it is ok for Vec<T>

Do you think you can add such tests? Feel free to add any further combinations that seem worth covering -- I see no reason not to "tile the space" here with tests in every combination we can think of.

@weiznich
Copy link
Contributor Author

@nikomatsakis I've added some more tests.

Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome, thanks!

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 18, 2019

📌 Commit a9c38d9 has been approved by nikomatsakis

@bors 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 18, 2019
@nikomatsakis
Copy link
Contributor

@bors r- -- wait, I see an error in CI

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2019
@nikomatsakis
Copy link
Contributor

r=me once CI is green :)

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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-18T20:15:28.8471982Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-18T20:15:28.8695843Z ##[command]git config gc.auto 0
2019-09-18T20:15:28.8792181Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-18T20:15:28.8852610Z ##[command]git config --get-all http.proxy
2019-09-18T20:15:28.9015124Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64546/merge:refs/remotes/pull/64546/merge
---
2019-09-18T20:22:46.5176252Z    Compiling serde_json v1.0.40
2019-09-18T20:22:48.4169798Z    Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
2019-09-18T20:22:59.8571410Z     Finished release [optimized] target(s) in 1m 35s
2019-09-18T20:22:59.8657771Z tidy check
2019-09-18T20:23:00.5314602Z tidy error: /checkout/src/test/ui/coherence/impl-foreign[foreign]-for-foreign.rs:13: line longer than 100 chars
2019-09-18T20:23:01.9382698Z some tidy checks failed
2019-09-18T20:23:01.9383726Z 
2019-09-18T20:23:01.9383726Z 
2019-09-18T20:23:01.9385329Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor"
2019-09-18T20:23:01.9385609Z 
2019-09-18T20:23:01.9386208Z 
2019-09-18T20:23:01.9393547Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
2019-09-18T20:23:01.9394074Z Build completed unsuccessfully in 0:01:38
2019-09-18T20:23:01.9394074Z Build completed unsuccessfully in 0:01:38
2019-09-18T20:23:01.9449624Z == clock drift check ==
2019-09-18T20:23:01.9470702Z   local time: Wed Sep 18 20:23:01 UTC 2019
2019-09-18T20:23:02.1118165Z   network time: Wed, 18 Sep 2019 20:23:02 GMT
2019-09-18T20:23:02.1123875Z == end clock drift check ==
2019-09-18T20:23:03.5036022Z ##[error]Bash exited with code '1'.
2019-09-18T20:23:03.5070634Z ##[section]Starting: Checkout
2019-09-18T20:23:03.5072947Z ==============================================================================
2019-09-18T20:23:03.5073027Z Task         : Get sources
2019-09-18T20:23:03.5073233Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@weiznich
Copy link
Contributor Author

@nikomatsakis CI is green.

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 20, 2019

📌 Commit 31b3012 has been approved by nikomatsakis

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 20, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 20, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
tmandry added a commit to tmandry/rust that referenced this pull request Sep 20, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
tmandry added a commit to tmandry/rust that referenced this pull request Sep 20, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
@ecstatic-morse
Copy link
Contributor

@weiznich There should be an even number of renames. You still have a comma somewhere.

@Centril
Copy link
Contributor

Centril commented Sep 24, 2019

@bors r- ^--

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 24, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed (pretty log, 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-24T19:16:18.7300874Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-24T19:16:18.7479728Z ##[command]git config gc.auto 0
2019-09-24T19:16:18.7553122Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-24T19:16:18.7616510Z ##[command]git config --get-all http.proxy
2019-09-24T19:16:18.7757933Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64546/merge:refs/remotes/pull/64546/merge
---
2019-09-24T20:19:55.8707019Z .................................................................................................... 1500/9056
2019-09-24T20:20:02.5079398Z .................................................................................................... 1600/9056
2019-09-24T20:20:13.3674774Z ...........................................................................................i........ 1700/9056
2019-09-24T20:20:21.1946451Z .......i............................................................................................ 1800/9056
2019-09-24T20:20:28.7020628Z ..................................................................................iiiii............. 1900/9056
2019-09-24T20:20:51.3616664Z .................................................................................................... 2100/9056
2019-09-24T20:20:53.9505231Z .................................................................................................... 2200/9056
2019-09-24T20:20:56.7406071Z .................................................................................................... 2300/9056
2019-09-24T20:21:03.6224156Z .................................................................................................... 2400/9056
---
2019-09-24T20:24:08.3237375Z .......................................................................i...............i............ 4700/9056
2019-09-24T20:24:17.4465606Z .................................................................................................... 4800/9056
2019-09-24T20:24:26.9967777Z .................................................................................................... 4900/9056
2019-09-24T20:24:33.5019477Z .................................................................................................... 5000/9056
2019-09-24T20:24:44.1948296Z ..........................................................ii.ii..................................... 5100/9056
2019-09-24T20:24:54.2108515Z .................................................................................................... 5300/9056
2019-09-24T20:25:04.0867565Z .................................................................................................... 5400/9056
2019-09-24T20:25:12.1425585Z .......................i............................................................................ 5500/9056
2019-09-24T20:25:18.3712172Z .................................................................................................... 5600/9056
2019-09-24T20:25:18.3712172Z .................................................................................................... 5600/9056
2019-09-24T20:25:30.8739482Z .................................................................................................... 5700/9056
2019-09-24T20:25:42.3229042Z ..................ii...i..ii...........i............................................................ 5800/9056
2019-09-24T20:26:05.0942059Z .................................................................................................... 6000/9056
2019-09-24T20:26:11.5697996Z .................................................................................................... 6100/9056
2019-09-24T20:26:11.5697996Z .................................................................................................... 6100/9056
2019-09-24T20:26:26.2580221Z ....................i..ii........................................................................... 6200/9056
2019-09-24T20:26:45.8331850Z ................................................................................i................... 6400/9056
2019-09-24T20:26:48.1446583Z .................................................................................................... 6500/9056
2019-09-24T20:26:50.4550657Z ....................................................i............................................... 6600/9056
2019-09-24T20:26:53.7757293Z .................................................................................................... 6700/9056
---
2019-09-24T20:31:00.7124556Z 
2019-09-24T20:31:00.7125270Z ---- [ui] ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs stdout ----
2019-09-24T20:31:00.7125422Z diff of stderr:
2019-09-24T20:31:00.7125454Z 
2019-09-24T20:31:00.7125502Z 1 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2019-09-24T20:31:00.7125816Z -   --> $DIR/impl[t]-foreign[fundamental[t],local]-for-foreign.rs:12:1
2019-09-24T20:31:00.7126060Z +   --> $DIR/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs:12:1
2019-09-24T20:31:00.7126114Z 3    |
2019-09-24T20:31:00.7126175Z 4 LL | impl<T> Remote2<Box<T>, Local> for u32 {
2019-09-24T20:31:00.7126228Z 5    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
2019-09-24T20:31:00.7126305Z 7    = note: only traits defined in the current crate can be implemented for a type parameter
2019-09-24T20:31:00.7126369Z 8 
2019-09-24T20:31:00.7126369Z 8 
2019-09-24T20:31:00.7126417Z 9 error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2019-09-24T20:31:00.7126655Z -   --> $DIR/impl[t]-foreign[fundamental[t],local]-for-foreign.rs:16:1
2019-09-24T20:31:00.7126901Z +   --> $DIR/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs:16:1
2019-09-24T20:31:00.7126946Z 11    |
2019-09-24T20:31:00.7127835Z 12 LL | impl<'a, T> Remote2<&'a T, Local> for u32 {
2019-09-24T20:31:00.7127953Z 13    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
2019-09-24T20:31:00.7128153Z 
2019-09-24T20:31:00.7128200Z The actual stderr differed from the expected stderr.
2019-09-24T20:31:00.7128200Z The actual stderr differed from the expected stderr.
2019-09-24T20:31:00.7128680Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign/impl[t]-foreign[fundamental[t]_local]-for-foreign.stderr
2019-09-24T20:31:00.7128949Z To update references, rerun the tests and pass the `--bless` flag
2019-09-24T20:31:00.7129327Z To only update this specific test, also pass `--test-args coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs`
2019-09-24T20:31:00.7129417Z error: 1 errors occurred comparing output.
2019-09-24T20:31:00.7129465Z status: exit code: 1
2019-09-24T20:31:00.7129465Z status: exit code: 1
2019-09-24T20:31:00.7130376Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.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/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--crate-name=test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign/auxiliary" "-A" "unused"
2019-09-24T20:31:00.7130763Z ------------------------------------------
2019-09-24T20:31:00.7130799Z 
2019-09-24T20:31:00.7131060Z ------------------------------------------
2019-09-24T20:31:00.7131110Z stderr:
2019-09-24T20:31:00.7131110Z stderr:
2019-09-24T20:31:00.7131351Z ------------------------------------------
2019-09-24T20:31:00.7131420Z error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2019-09-24T20:31:00.7131764Z   --> /checkout/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs:12:1
2019-09-24T20:31:00.7131830Z    |
2019-09-24T20:31:00.7131878Z LL | impl<T> Remote2<Box<T>, Local> for u32 {
2019-09-24T20:31:00.7131957Z    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
2019-09-24T20:31:00.7132211Z    = note: only traits defined in the current crate can be implemented for a type parameter
2019-09-24T20:31:00.7132420Z 
2019-09-24T20:31:00.7132420Z 
2019-09-24T20:31:00.7132465Z error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
2019-09-24T20:31:00.7132722Z   --> /checkout/src/test/ui/coherence/impl[t]-foreign[fundamental[t]_local]-for-foreign.rs:16:1
2019-09-24T20:31:00.7132787Z    |
2019-09-24T20:31:00.7132984Z LL | impl<'a, T> Remote2<&'a T, Local> for u32 {
2019-09-24T20:31:00.7133044Z    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
2019-09-24T20:31:00.7133156Z    = note: only traits defined in the current crate can be implemented for a type parameter
2019-09-24T20:31:00.7133186Z 
2019-09-24T20:31:00.7133223Z error: aborting due to 2 previous errors
2019-09-24T20:31:00.7133267Z 
---
2019-09-24T20:31:00.7173796Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-09-24T20:31:00.7174829Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-24T20:31:00.7190163Z 
2019-09-24T20:31:00.7190369Z 
2019-09-24T20:31:00.7200611Z 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" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-09-24T20:31:00.7201534Z 
2019-09-24T20:31:00.7201608Z 
2019-09-24T20:31:00.7215312Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-24T20:31:00.7215688Z Build completed unsuccessfully in 1:07:15
2019-09-24T20:31:00.7215688Z Build completed unsuccessfully in 1:07:15
2019-09-24T20:31:00.7272307Z == clock drift check ==
2019-09-24T20:31:00.7285629Z   local time: Tue Sep 24 20:31:00 UTC 2019
2019-09-24T20:31:00.8779245Z   network time: Tue, 24 Sep 2019 20:31:00 GMT
2019-09-24T20:31:00.8783409Z == end clock drift check ==
2019-09-24T20:31:01.7413039Z ##[error]Bash exited with code '1'.
2019-09-24T20:31:01.7464591Z ##[section]Starting: Checkout
2019-09-24T20:31:01.7466587Z ==============================================================================
2019-09-24T20:31:01.7466641Z Task         : Get sources
2019-09-24T20:31:01.7466708Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

@weiznich weiznich force-pushed the bugfix/rfc-2451-rerebalance-tests branch from cfe2554 to a482d52 Compare September 24, 2019 21:22
@weiznich
Copy link
Contributor Author

@ecstatic-morse Not necessarily, because not all of the tests are compile fail tests.

@weiznich weiznich force-pushed the bugfix/rfc-2451-rerebalance-tests branch from a482d52 to 9249a73 Compare September 24, 2019 21:56
@weiznich
Copy link
Contributor Author

@Centril Next try?

@Centril
Copy link
Contributor

Centril commented Sep 25, 2019

@bors r=nikomatsakis rollup=never

@bors
Copy link
Contributor

bors commented Sep 25, 2019

📌 Commit 9249a73 has been approved by nikomatsakis

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 25, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 27, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
Centril added a commit to Centril/rust that referenced this pull request Sep 28, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
bors added a commit that referenced this pull request Sep 28, 2019
Rollup of 6 pull requests

Successful merges:

 - #64455 (Add Long error explanation for E0531)
 - #64546 (Bugfix/rfc 2451 rerebalance tests)
 - #64589 (Differentiate AArch64 bare-metal targets between hf and non-hf.)
 - #64763 (Add E0734 and its long explanation)
 - #64793 (Fix format macro expansions spans to be macro-generated)
 - #64799 (Fix double panic when printing query stack during an ICE)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Sep 28, 2019
…e-tests, r=nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes rust-lang#64412
Depends/Contains on rust-lang#64414

cc rust-lang#55437 and rust-lang#63599
@Centril
Copy link
Contributor

Centril commented Sep 28, 2019

@bors p=3

bors added a commit that referenced this pull request Sep 29, 2019
…nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes #64412
Depends/Contains on #64414

cc #55437 and #63599
@bors
Copy link
Contributor

bors commented Sep 29, 2019

⌛ Testing commit 9249a73 with merge d046ffd...

@bors
Copy link
Contributor

bors commented Sep 29, 2019

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing d046ffd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2019
@bors bors merged commit 9249a73 into rust-lang:master Sep 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

re_rebalance_coherence doesn't properly account for fundamental types
6 participants