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

stabilize cfg_attr_multi #57332

Merged
merged 4 commits into from Jan 8, 2019

Conversation

Projects
None yet
6 participants
@Dylan-DPC
Copy link
Member

Dylan-DPC commented Jan 4, 2019

Stabilizes cfg_attr_multi feature

Related to #54881

Will add the lint in a seperate PR

r? @Centril

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Jan 4, 2019

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:1b56faa0:start=1546586293616002126,finish=1546586401542122060,duration=107926119934
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:05:30]    Compiling rustc_data_structures v0.0.0 (/checkout/src/librustc_data_structures)
[00:05:33]    Compiling arena v0.0.0 (/checkout/src/libarena)
[00:05:33]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:05:38]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:05:51] error: unused import: `emit_feature_err`
[00:05:51]  --> src/libsyntax/config.rs:8:5
[00:05:51] 8 |     emit_feature_err,
[00:05:51]   |     ^^^^^^^^^^^^^^^^
[00:05:51]   |
[00:05:51]   = note: `-D unused-imports` implied by `-D warnings`

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)

Show resolved Hide resolved src/test/ui/conditional-compilation/cfg-attr-parse.rs Outdated
Show resolved Hide resolved src/libsyntax/feature_gate.rs Outdated

@Centril Centril added the relnotes label Jan 4, 2019

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Jan 4, 2019

You have some merge conflicts that'll need to be resolved by rebasing; other than that it looks good.

@Dylan-DPC

This comment has been minimized.

Copy link
Member Author

Dylan-DPC commented Jan 5, 2019

Damn some issue with the rebase.. let me try again

@Dylan-DPC Dylan-DPC force-pushed the Dylan-DPC:feature/stabilise-cfg-attr branch from f148a68 to fdc2f54 Jan 5, 2019

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Jan 5, 2019

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:03b26f80:start=1546678024535720618,finish=1546678025427659892,duration=891939274
$ 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
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:59:12] .................................................................................................... 300/5293
[00:59:14] .................................................................................................... 400/5293
[00:59:18] .................................................................................................... 500/5293
[00:59:21] ...............................i.................................................................... 600/5293
[00:59:25] .................................................................................FF................. 700/5293
[00:59:36] .......................................................................i...............i............ 900/5293
[00:59:39] .................................................................................................iii 1000/5293
[00:59:43] ii.................................................................................................. 1100/5293
[00:59:45] .................................................................................................... 1200/5293
---
[01:01:52] .................................................................................................... 4800/5293
[01:01:57] .................................................................................................... 4900/5293
[01:02:00] .................................................................................................... 5000/5293
[01:02:06] .................................................................................................... 5200/5293
xperimental","highlight_start":29,"highlight_end":36}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"add #![feature(no_core)] to the crate attributes to enable","code":null,"level":"help","spans":[],"children":[],"rendered":null}],"rendered":"error[E0658]: no_core is experimental (see issue #29639)\n  --> /checkout/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.rs:4:29\n   |\nLL | #![cfg_attr(broken, no_std, no_core)] //~ ERROR no_core is experimental\n   |                             ^^^^^^^\n   |\n   = help: add #![feature(no_core)] to the crate attributes to enable\n\n"}
[01:02:09] {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
[01:02:09] {"message":"For more information about this error, try `rustc --explain E0658`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0658`.\n"}
[01:02:09] ------------------------------------------
[01:02:09] 
[01:02:09] thread '[ui] ui/conditional-compilation/cfg-attr-multi-invalid-2.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3245:9
[01:02:09] 
---
[01:02:09] 
[01:02:09] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:495:22
[01:02:09] 
[01:02:09] 
[01:02:09] 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:02:09] 
[01:02:09] 
[01:02:09] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:02:09] Build completed unsuccessfully in 0:04:04
[01:02:09] Build completed unsuccessfully in 0:04:04
[01:02:09] Makefile:48: recipe for target 'check' failed
[01:kout!\(.*\)|\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:030bae98
travis_time:start:030bae98
$ 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:03a44134
$ 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)

@bors

This comment was marked as resolved.

Copy link
Contributor

bors commented Jan 6, 2019

☔️ The latest upstream changes (presumably #57272) made this pull request unmergeable. Please resolve the merge conflicts.

@Dylan-DPC Dylan-DPC force-pushed the Dylan-DPC:feature/stabilise-cfg-attr branch from 268204a to 13f8ad8 Jan 7, 2019

@Centril

Centril approved these changes Jan 8, 2019

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Jan 8, 2019

Looks good; thanks!

Giving prio to this since it's a stabilization.

@bors r+ p=1

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit 13f8ad8 has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

⌛️ Testing commit 13f8ad8 with merge 7ad470c...

bors added a commit that referenced this pull request Jan 8, 2019

Auto merge of #57332 - Dylan-DPC:feature/stabilise-cfg-attr, r=Centril
stabilize cfg_attr_multi

Stabilizes cfg_attr_multi feature

Related to #54881

Will add the lint in a seperate PR

r? @Centril
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

☀️ Test successful - status-appveyor, status-travis
Approved by: Centril
Pushing 7ad470c to master...

@bors bors merged commit 13f8ad8 into rust-lang:master Jan 8, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 8, 2019

📣 Toolstate changed by #57332!

Tested on commit 7ad470c.
Direct link to PR: #57332

💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 8, 2019

📣 Toolstate changed by rust-lang/rust#57332!
Tested on commit rust-lang/rust@7ad470c.
Direct link to PR: <rust-lang/rust#57332>

💔 rls on linux: test-pass → test-fail (cc @nrc @Xanewok, @rust-lang/infra).
@Xanewok

This comment has been minimized.

Copy link
Member

Xanewok commented Jan 8, 2019

I believe this is spurious, (un?)fortunately:

thread 'cmd_changing_workspace_lib_retains_bin_diagnostics' panicked at 'expected bin error diagnostic', src/libcore/option.rs:1040:5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment