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

add new tests for re_rebalance_coherence #64414

Merged
merged 2 commits into from
Sep 29, 2019

Conversation

nikomatsakis
Copy link
Contributor

cc #63599 and #64412

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

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

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Sep 12, 2019

📌 Commit f0bb320bd715fd2da295e5fa756a8c18deb51498 has been approved by alexcrichton

@alexcrichton alexcrichton reopened this Sep 12, 2019
@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 12, 2019
@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Sep 12, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Sep 12, 2019

📌 Commit f0bb320bd715fd2da295e5fa756a8c18deb51498 has been approved by alexcrichton

@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-12T22:08:13.1822656Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-12T22:08:13.7856362Z ##[command]git config gc.auto 0
2019-09-12T22:08:13.7859319Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-12T22:08:13.7861291Z ##[command]git config --get-all http.proxy
2019-09-12T22:08:13.7866064Z ##[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/64414/merge:refs/remotes/pull/64414/merge
---
2019-09-12T23:14:16.2782306Z .................................................................................................... 1500/9013
2019-09-12T23:14:22.6607999Z .................................................................................................... 1600/9013
2019-09-12T23:14:36.1642912Z ...........................................................i...............i........................ 1700/9013
2019-09-12T23:14:44.5217245Z .................................................................................................... 1800/9013
2019-09-12T23:15:00.6266267Z ..................................................iiiii............................................. 1900/9013
2019-09-12T23:15:12.4735746Z .................................................................................................... 2100/9013
2019-09-12T23:15:15.1437359Z .................................................................................................... 2200/9013
2019-09-12T23:15:18.7831071Z .................................................................................................... 2300/9013
2019-09-12T23:15:27.4676350Z .................................................................................................... 2400/9013
---
2019-09-12T23:18:36.9773651Z .....................................i...............i.............................................. 4700/9013
2019-09-12T23:18:49.0798458Z .................................................................................................... 4800/9013
2019-09-12T23:18:56.1035682Z .................................................................................................... 4900/9013
2019-09-12T23:19:07.5934332Z .................................................................................................... 5000/9013
2019-09-12T23:19:14.1921722Z ....................ii.ii........................................................................... 5100/9013
2019-09-12T23:19:25.2917233Z .................................................................................................... 5300/9013
2019-09-12T23:19:36.0250310Z ....................................................................................i............... 5400/9013
2019-09-12T23:19:44.5997093Z .................................................................................................... 5500/9013
2019-09-12T23:19:50.4390523Z .................................................................................................... 5600/9013
2019-09-12T23:19:50.4390523Z .................................................................................................... 5600/9013
2019-09-12T23:20:01.6084658Z ...............................................................................ii...i..i.i.......... 5700/9013
2019-09-12T23:20:17.9456576Z i................................................................................................... 5800/9013
2019-09-12T23:20:38.7109758Z .................................................................................................... 6000/9013
2019-09-12T23:20:38.7109758Z .................................................................................................... 6000/9013
2019-09-12T23:20:46.6306665Z .................................................................................i..ii.............. 6100/9013
2019-09-12T23:21:18.3579917Z .................................................................................................... 6300/9013
2019-09-12T23:21:20.7827542Z ........................................i........................................................... 6400/9013
2019-09-12T23:21:23.1352472Z .................................................................................................... 6500/9013
2019-09-12T23:21:25.7983969Z ............i....................................................................................... 6600/9013
---
2019-09-12T23:25:41.9438418Z .....................i.............................................................................. 9000/9013
2019-09-12T23:25:48.1550256Z .............
2019-09-12T23:25:48.1550998Z failures:
2019-09-12T23:25:48.1609621Z 
2019-09-12T23:25:48.1610324Z ---- [ui] ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs stdout ----
2019-09-12T23:25:48.1610439Z warning: unused import: `std::rc::Rc`
2019-09-12T23:25:48.1610439Z warning: unused import: `std::rc::Rc`
2019-09-12T23:25:48.1610736Z   --> $DIR/impl[t]-foreign[local]-for-fundamental[t].rs:9:5
2019-09-12T23:25:48.1610830Z LL | use std::rc::Rc;
2019-09-12T23:25:48.1610890Z    |     ^^^^^^^^^^^
2019-09-12T23:25:48.1610933Z    |
2019-09-12T23:25:48.1610979Z    = note: `#[warn(unused_imports)]` on by default
2019-09-12T23:25:48.1610979Z    = note: `#[warn(unused_imports)]` on by default
2019-09-12T23:25:48.1611012Z 
2019-09-12T23:25:48.1611056Z 
2019-09-12T23:25:48.1611081Z 
2019-09-12T23:25:48.1611226Z 
2019-09-12T23:25:48.1611281Z The actual stderr differed from the expected stderr.
2019-09-12T23:25:48.1611677Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t]/impl[t]-foreign[local]-for-fundamental[t].stderr
2019-09-12T23:25:48.1611930Z To update references, rerun the tests and pass the `--bless` flag
2019-09-12T23:25:48.1612226Z To only update this specific test, also pass `--test-args coherence/impl[t]-foreign[local]-for-fundamental[t].rs`
2019-09-12T23:25:48.1612339Z error: 1 errors occurred comparing output.
2019-09-12T23:25:48.1612384Z status: exit code: 0
2019-09-12T23:25:48.1612384Z status: exit code: 0
2019-09-12T23:25:48.1613229Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t]/a" "-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[local]-for-fundamental[t]/auxiliary"
2019-09-12T23:25:48.1613574Z ------------------------------------------
2019-09-12T23:25:48.1613610Z 
2019-09-12T23:25:48.1613832Z ------------------------------------------
2019-09-12T23:25:48.1614127Z stderr:
2019-09-12T23:25:48.1614127Z stderr:
2019-09-12T23:25:48.1614403Z ------------------------------------------
2019-09-12T23:25:48.1614453Z warning: unused import: `std::rc::Rc`
2019-09-12T23:25:48.1614712Z   --> /checkout/src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs:9:5
2019-09-12T23:25:48.1614828Z LL | use std::rc::Rc;
2019-09-12T23:25:48.1614873Z    |     ^^^^^^^^^^^
2019-09-12T23:25:48.1614934Z    |
2019-09-12T23:25:48.1614981Z    = note: `#[warn(unused_imports)]` on by default
2019-09-12T23:25:48.1614981Z    = note: `#[warn(unused_imports)]` on by default
2019-09-12T23:25:48.1615013Z 
2019-09-12T23:25:48.1615039Z 
2019-09-12T23:25:48.1615275Z ------------------------------------------
2019-09-12T23:25:48.1615308Z 
2019-09-12T23:25:48.1615335Z 
2019-09-12T23:25:48.1615360Z 
2019-09-12T23:25:48.1615401Z failures:
2019-09-12T23:25:48.1615781Z     [ui] ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
2019-09-12T23:25:48.1616118Z test result: FAILED. 8974 passed; 1 failed; 38 ignored; 0 measured; 0 filtered out
2019-09-12T23:25:48.1616166Z 
2019-09-12T23:25:48.1651030Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-09-12T23:25:48.1651179Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-12T23:25:48.1651179Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-12T23:25:48.1668943Z 
2019-09-12T23:25:48.1669073Z 
2019-09-12T23:25:48.1675162Z 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-12T23:25:48.1675784Z 
2019-09-12T23:25:48.1675821Z 
2019-09-12T23:25:48.1689913Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-12T23:25:48.1690058Z Build completed unsuccessfully in 1:10:11
2019-09-12T23:25:48.1690058Z Build completed unsuccessfully in 1:10:11
2019-09-12T23:25:48.1745737Z == clock drift check ==
2019-09-12T23:25:48.1759173Z   local time: Thu Sep 12 23:25:48 UTC 2019
2019-09-12T23:25:48.3274180Z   network time: Thu, 12 Sep 2019 23:25:48 GMT
2019-09-12T23:25:48.3281038Z == end clock drift check ==
2019-09-12T23:25:49.2737121Z ##[error]Bash exited with code '1'.
2019-09-12T23:25:49.2782012Z ##[section]Starting: Checkout
2019-09-12T23:25:49.2784001Z ==============================================================================
2019-09-12T23:25:49.2784057Z Task         : Get sources
2019-09-12T23:25:49.2784106Z 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)

@Centril
Copy link
Contributor

Centril commented Sep 13, 2019

Also, PR builder failed, @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 13, 2019
@nikomatsakis
Copy link
Contributor Author

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 13, 2019

📌 Commit bb4141d94305283ae01684e0fad4509bc38a2e8c 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 13, 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
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
tmandry added a commit to tmandry/rust that referenced this pull request Sep 21, 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 22, 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 24, 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 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
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 29, 2019
…nikomatsakis

Bugfix/rfc 2451 rerebalance tests

r? @nikomatsakis

Fixes #64412
Depends/Contains on #64414

cc #55437 and #63599
@bors bors merged commit e69d1b6 into rust-lang:master Sep 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 26, 2019
…low-fundamental-local, r=nikomatsakis

Coherence should allow fundamental types to impl traits when they are local

After rust-lang#64414, `impl<T> Remote for Box<T> { }` is disallowed, but it is also disallowed in liballoc, where `Box` is a local type!

Enabling `#![feature(re_rebalance_coherence)]` in `liballoc` results in:
```
error[E0210]: type parameter `F` must be used as the type parameter for some local type (e.g., `MyStruct<F>`)
    --> src\liballoc\boxed.rs:1098:1
     |
1098 | impl<F: ?Sized + Future + Unpin> Future for Box<F> {
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `F` must be used as the type parameter for some local type
```

This PR relaxes `uncover_fundamental_ty` to skip local fundamental types.
I didn't add a test since `liballoc` already fails to compile, but I can add one if needed.

r? @nikomatsakis

cc rust-lang#63599
Centril added a commit to Centril/rust that referenced this pull request Oct 26, 2019
…low-fundamental-local, r=nikomatsakis

Coherence should allow fundamental types to impl traits when they are local

After rust-lang#64414, `impl<T> Remote for Box<T> { }` is disallowed, but it is also disallowed in liballoc, where `Box` is a local type!

Enabling `#![feature(re_rebalance_coherence)]` in `liballoc` results in:
```
error[E0210]: type parameter `F` must be used as the type parameter for some local type (e.g., `MyStruct<F>`)
    --> src\liballoc\boxed.rs:1098:1
     |
1098 | impl<F: ?Sized + Future + Unpin> Future for Box<F> {
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `F` must be used as the type parameter for some local type
```

This PR relaxes `uncover_fundamental_ty` to skip local fundamental types.
I didn't add a test since `liballoc` already fails to compile, but I can add one if needed.

r? @nikomatsakis

cc rust-lang#63599
Centril added a commit to Centril/rust that referenced this pull request Oct 27, 2019
…low-fundamental-local, r=nikomatsakis

Coherence should allow fundamental types to impl traits when they are local

After rust-lang#64414, `impl<T> Remote for Box<T> { }` is disallowed, but it is also disallowed in liballoc, where `Box` is a local type!

Enabling `#![feature(re_rebalance_coherence)]` in `liballoc` results in:
```
error[E0210]: type parameter `F` must be used as the type parameter for some local type (e.g., `MyStruct<F>`)
    --> src\liballoc\boxed.rs:1098:1
     |
1098 | impl<F: ?Sized + Future + Unpin> Future for Box<F> {
     | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `F` must be used as the type parameter for some local type
```

This PR relaxes `uncover_fundamental_ty` to skip local fundamental types.
I didn't add a test since `liballoc` already fails to compile, but I can add one if needed.

r? @nikomatsakis

cc rust-lang#63599
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants