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 rollups #58656

Merged
merged 13 commits into from
Feb 23, 2019
Merged

Beta rollups #58656

merged 13 commits into from
Feb 23, 2019

Conversation

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2019
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@Mark-Simulacrum
Copy link
Member Author

(Why did highfive comment twice?)

@pietroalbini
Copy link
Member

@bors r+ p=50

(Why did highfive comment twice?)

That's a good question, I'll start looking for a good answer!

@bors
Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit dc9daa4557a874a3e9df5d859f854bb29da84dfc has been approved by pietroalbini

@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 Feb 22, 2019
@bors
Copy link
Contributor

bors commented Feb 22, 2019

⌛ Testing commit dc9daa4557a874a3e9df5d859f854bb29da84dfc with merge 864a406f8d1eb4ba874b23df7e4e67f901a75378...

@bors
Copy link
Contributor

bors commented Feb 22, 2019

💔 Test failed - checks-travis

@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 Feb 22, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-nopt of your PR failed on Travis (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.
[01:29:43] failures:
[01:29:43] 
[01:29:43] ---- [ui (nll)] ui/impl-trait/issue-57464.rs stdout ----
[01:29:43] 
[01:29:43] error: Error: expected failure status (Some(1)) but received status Some(101).
[01:29:43] status: exit code: 101
[01:29:43] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/impl-trait/issue-57464.rs" "--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/impl-trait/issue-57464.nll/a" "-Zborrowck=migrate" "-Ztwo-phase-borrows" "-Crpath" "-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/impl-trait/issue-57464.nll/auxiliary" "-A" "unused"
[01:29:43] ------------------------------------------
[01:29:43] 
[01:29:43] ------------------------------------------
[01:29:43] stderr:
[01:29:43] stderr:
[01:29:43] ------------------------------------------
[01:29:43] {"message":"src/librustc_mir/borrow_check/nll/universal_regions.rs:744: cannot convert `ReScope(CallSite(16))` to a region vid","code":null,"level":"error: internal compiler error","spans":[],"children":[],"rendered":"error: internal compiler error: src/librustc_mir/borrow_check/nll/universal_regions.rs:744: cannot convert `ReScope(CallSite(16))` to a region vid\n\n"}
[01:29:43] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:29:43] {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
[01:29:43] 
[01:29:43] note: the compiler unexpectedly panicked. this is a bug.
[01:29:43] note: the compiler unexpectedly panicked. this is a bug.
[01:29:43] 
[01:29:43] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[01:29:43] 
[01:29:43] note: rustc 1.33.0-dev running on x86_64-unknown-linux-gnu
[01:29:43] 
[01:29:43] note: compiler flags: -Z ui-testing -Z borrowck=migrate -Z two-phase-borrows -Z unstable-options -C prefer-dynamic -C rpath
[01:29:43] 
[01:29:43] ------------------------------------------
[01:29:43] 
[01:29:43] thread '[ui (nll)] ui/impl-trait/issue-57464.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3245:9
---
[01:29:43] 
[01:29:43] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:495:22
[01:29:43] 
[01:29:43] 
[01:29:43] 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 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -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.0svn\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"
[01:29:43] 
[01:29:43] 
[01:29:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:29:43] Build completed unsuccessfully in 0:07:58
[01:29:43] Build completed unsuccessfully in 0:07:58
[01:29:43] Makefile:48: recipe for target 'check' failed
[01:29:43] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:00756c98
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri Feb 22 21:30:54 UTC 2019
---
travis_time:end:12b401a0:start=1550871055996758404,finish=1550871056005230208,duration=8471804
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:27be29d8
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:11d66d2f
travis_time:start:11d66d2f
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:102dc8e0
$ dmesg | grep -i kill

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)

@Mark-Simulacrum
Copy link
Member Author

Discussed on Zulip, will back out the PR that introduced this test: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/beta.20backports

nikomatsakis and others added 12 commits February 22, 2019 16:43
In our type inference system, when we "generalize" a type T to become
a suitable value for a type variable V, we sometimes wind up creating
new inference variables. So, for example, if we are making V be some
subtype of `&'X u32`, then we might instantiate V with `&'Y u32`.
This generalized type is then related `&'Y u32 <: &'X u32`, resulting
in a region constriant `'Y: 'X`. Previously, however, we were making
these fresh variables like `'Y` in the "current universe", but they
should be created in the universe of V. Moreover, we sometimes cheat
in an invariant context and avoid creating fresh variables if we know
the result must be equal -- we can only do that when the universes
work out.
This set of diffs was produced by combing through
b68fad6 and seeing where the
`leak_check` used to be invoked and how.
One surprise: old-lub-glb-object.rs, may indicate a bug
This preserves the error you currently get on stable for the
old-lub-glb-object.rs test.
Incorporates a bunch of the documentation-related comments that came up when discussing `Pin` stabilization.
Cherry-picked (and squashed) from rust-lang#58227.
@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit 5c6eb4e has been approved by pietroalbini

@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 Feb 22, 2019
@bors
Copy link
Contributor

bors commented Feb 23, 2019

⌛ Testing commit 5c6eb4e with merge bb2d0ea...

bors added a commit that referenced this pull request Feb 23, 2019
@bors
Copy link
Contributor

bors commented Feb 23, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pietroalbini
Pushing bb2d0ea to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2019
@bors bors merged commit 5c6eb4e into rust-lang:beta Feb 23, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the beta-rollups branch February 23, 2019 15:38
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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. rollup A PR which is a rollup 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.

10 participants