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 #59295

Merged
merged 7 commits into from
Mar 20, 2019
Merged

[beta] Rollup backports #59295

merged 7 commits into from
Mar 20, 2019

Conversation

pietroalbini
Copy link
Member

Rolled up:

Cherry-picked:

r? @ghost

Mark-Simulacrum and others added 6 commits March 3, 2019 09:58
I used version-channel-sha, hopefully that should work.

I checked that bootstrap builds, but I cannot check anything else since the llvm
build process is started from cargo, and thus calls clang, and thus I hit the
same bug I hope to fix with this change.

Hopefully fixes rust-lang#59034.
@pietroalbini
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Mar 19, 2019

📌 Commit 8a1e433 has been approved by pietroalbini

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

The job x86_64-gnu-llvm-6.0 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.
travis_time:end:012f3b1c:start=1553012238670984596,finish=1553012345993862719,duration=107322878123
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
[01:07:34] .................................................................................................... 4300/5432
[01:07:37] .................................................................................................... 4400/5432
[01:07:40] .................................................................................................... 4500/5432
[01:07:44] .............................................................................i...................... 4600/5432
[01:07:50] .............................................................................................F...... 4700/5432
[01:07:56] .................................................................................................... 4900/5432
[01:08:01] .................................................................................................... 5000/5432
[01:08:04] .................................................................................................... 5100/5432
[01:08:07] .................................................................................................... 5200/5432
---
[01:08:14] 
[01:08:14] 1 error: cannot use a built-in attribute through an import
[01:08:14] 2   --> $DIR/cross-crate.rs:7:3
[01:08:14] 3    |
[01:08:14] - LL | #[built_in_attr]
[01:08:14] + LL | #[built_in_attr] //~ ERROR cannot use a built-in attribute through an import
[01:08:14] 6    |
[01:08:14] 7 note: the built-in attribute imported here
[01:08:14] 
[01:08:14] 13 error: cannot use a tool module through an import
[01:08:14] 13 error: cannot use a tool module through an import
[01:08:14] 14   --> $DIR/cross-crate.rs:8:3
[01:08:14] 15    |
[01:08:14] - LL | #[tool_mod::skip]
[01:08:14] + LL | #[tool_mod::skip] //~ ERROR cannot use a tool module through an import
[01:08:14] 18    |
[01:08:14] 19 note: the tool module imported here
[01:08:14] 
[01:08:14] 
[01:08:14] 
[01:08:14] The actual stderr differed from the expected stderr.
[01:08:14] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/rust-2018/uniform-paths/cross-crate/cross-crate.stderr
[01:08:14] To update references, rerun the tests and pass the `--bless` flag
[01:08:14] To only update this specific test, also pass `--test-args rust-2018/uniform-paths/cross-crate.rs`
[01:08:14] error: 1 errors occurred comparing output.
[01:08:14] status: exit code: 1
[01:08:14] status: exit code: 1
[01:08:14] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.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/rust-2018/uniform-paths/cross-crate/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--edition=2018" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/rust-2018/uniform-paths/cross-crate/auxiliary" "-A" "unused"
[01:08:14] ------------------------------------------
[01:08:14] 
[01:08:14] ------------------------------------------
[01:08:14] stderr:
[01:08:14] stderr:
[01:08:14] ------------------------------------------
[01:08:14] {"message":"cannot use a built-in attribute through an import","code":null,"level":"error","spans":[{"file_name":"/checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs","byte_start":94,"byte_end":107,"line_start":7,"line_end":7,"column_start":3,"column_end":16,"is_primary":true,"text":[{"text":"#[built_in_attr] //~ ERROR cannot use a built-in attribute through an import","highlight_start":3,"highlight_end":16}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"the built-in attribute imported here","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs","byte_start":75,"byte_end":89,"line_start":5,"line_end":5,"column_start":5,"column_end":19,"is_primary":true,"text":[{"text":"use cross_crate::*;","highlight_start":5,"highlight_end":19}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error: cannot use a built-in attribute through an import\n  --> /checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs:7:3\n   |\nLL | #[built_in_attr] //~ ERROR cannot use a built-in attribute through an import\n   |   ^^^^^^^^^^^^^\n   |\nnote: the built-in attribute imported here\n  --> /checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs:5:5\n   |\nLL | use cross_crate::*;\n   |     ^^^^^^^^^^^^^^\n\n"}
[01:08:14] {"message":"cannot use a tool module through an import","code":null,"level":"error","spans":[{"file_name":"/checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs","byte_start":171,"byte_end":179,"line_start":8,"line_end":8,"column_start":3,"column_end":11,"is_primary":true,"text":[{"text":"#[tool_mod::skip] //~ ERROR cannot use a tool module through an import","highlight_start":3,"highlight_end":11}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"the tool module imported here","code":null,"level":"note","spans":[{"file_name":"/checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs","byte_start":75,"byte_end":89,"line_start":5,"line_end":5,"column_start":5,"column_end":19,"is_primary":true,"text":[{"text":"use cross_crate::*;","highlight_start":5,"highlight_end":19}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null}],"rendered":"error: cannot use a tool module through an import\n  --> /checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs:8:3\n   |\nLL | #[tool_mod::skip] //~ ERROR cannot use a tool module through an import\n   |   ^^^^^^^^\n   |\nnote: the tool module imported here\n  --> /checkout/src/test/ui/rust-2018/uniform-paths/cross-crate.rs:5:5\n   |\nLL | use cross_crate::*;\n   |     ^^^^^^^^^^^^^^\n\n"}
[01:08:14] 
[01:08:14] ------------------------------------------
[01:08:14] 
[01:08:14] thread '[ui] ui/rust-2018/uniform-paths/cross-crate.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3295:9
---
[01:08:14] 
[01:08:14] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:496:22
[01:08:14] 
[01:08:14] 
[01:08:14] 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 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -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"
[01:08:14] 
[01:08:14] 
[01:08:14] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:08:14] Build completed unsuccessfully in 0:04:08
[01:08:14] Build completed unsuccessfully in 0:04:08
[01:08:14] make: *** [check] Error 1
[01:08:14] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2bfbfe0a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Mar 19 17:27:29 UTC 2019
---
travis_time:end:0a768f4d:start=1553016451017580797,finish=1553016451025571023,duration=7990226
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:15894945
$ 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:3b5fa5bf
$ 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

@bors r-

Forgot to bless tests?

@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 Mar 19, 2019
@pietroalbini
Copy link
Member Author

@bors r+ p=100

@bors
Copy link
Contributor

bors commented Mar 19, 2019

📌 Commit 12e476d 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 19, 2019
@bors
Copy link
Contributor

bors commented Mar 19, 2019

⌛ Testing commit 12e476d with merge d049c7b...

bors added a commit that referenced this pull request Mar 19, 2019
[beta] Rollup backports

Rolled up:

* [beta] Move to static.r-l.o stable release #58896

Cherry-picked:

* Add release notes for PR #56243 #58959
* resolve: Account for new importable entities #59047
* bootstrap: Default to a sensible llvm-suffix. #59173

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 20, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 20, 2019
@bors bors merged commit 12e476d into rust-lang:beta Mar 20, 2019
bors added a commit that referenced this pull request Mar 26, 2019
…crum

Bump bootstrap compiler to 2019-03-20

Includes #59295 and by extension #59047, which unblocks #58253, #58837, and possibly #59336, and so therefore:

@bors p=50

r? @Mark-Simulacrum

cc @pietroalbini
@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.

None yet

8 participants