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

Stabilize crate_in_paths, extern_absolute_paths and extern_prelude on all editions. #54403

Merged
merged 1 commit into from Sep 22, 2018

Conversation

Projects
None yet
@eddyb
Copy link
Member

eddyb commented Sep 20, 2018

Needed for beta, path-related migrations to Rust 2018 don't work on RC1 without these stabilizations.

r? @aturon cc @nikomatsakis @Centril @alexcrichton

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Sep 20, 2018

The job x86_64-gnu-llvm-5.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.
[00:26:23] 
[00:26:23] To learn more, run the command again with --verbose.
[00:26:23] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:26:23] expected success, got: exit code: 101
[00:26:23] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1135:9
[00:26:23] travis_fold:end:stage1-rustc

[00:26:23] travis_time:end:stage1-rustc:start=1537472019540332412,finish=1537472266405550200,duration=246865217788


[00:26:23] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:26:23] Build completed unsuccessfully in 0:21:13
[00:26:23] make: *** [all] Error 1
[00:26:23] Makefile:28: recipe for target 'all' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:093ed5fa
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@petrochenkov

This comment has been minimized.

Copy link
Contributor

petrochenkov commented Sep 20, 2018

*extern_absolute_paths cannot be stabilized on 2015 edition, it's a huge breaking change, but this PR stabilizes it only on 2018 edition despite the title, so it's ok.

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 20, 2018

@petrochenkov Right, we already have a distinction between "the feature-gate is stable" (which is what this PR affects) and "the feature affects semantics vs migrations" (which this PR doesn't touch).

@eddyb eddyb force-pushed the eddyb:oopsie-daisy-stabilize branch from 85b3d71 to 51abc8a Sep 20, 2018

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 20, 2018

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 20, 2018

📌 Commit 51abc8a has been approved by alexcrichton

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 20, 2018

@bors: p=1

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 20, 2018

@bors: p=3

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Sep 20, 2018

The job x86_64-gnu-llvm-5.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.
[00:48:04] ....................................................................................................
[00:48:07] ....................................................................................................
[00:48:09] ....................................................................................................
[00:48:12] ...................................i................................................................
[00:48:15] ..i...............F.................................................................................
[00:48:21] .........................................................................................i..........
[00:48:24] ....................................................................................................
[00:48:27] ....................................................................................................
[00:48:30] ....................................................................................................
[00:48:30] ....................................................................................................
[00:48:33] ....................................................................................................
[00:48:36] ....................................................................................................
[00:48:39] ....................................................................................................
[00:48:42] ....................................................................................................
[00:48:46] ....................................................................................................
[00:48:49] ...................................................................................i................
[00:48:52] ......F.............................................................................................
[00:48:59] ....................................................................................................
[00:49:02] .....................................................i..............................................
[00:49:05] ....................................................................................................
[00:49:08] ....................................................................................................
[00:49:08] ....................................................................................................
[00:49:11] ....................................................................................................
[00:49:14] .............................................................................................i......
[00:49:20] ....................................................................................................
[00:49:28] ....................................................................................................
[00:49:35] ....................................................................................................
[00:49:43] ....................................................................................................
[00:49:52] ....................................................................................................
[00:50:05] .............................................................................F.F....................
[00:50:24] ....................................................................................................
[00:50:35] ....................................................................................................
[00:50:44] ....................................................................................................
[00:50:51] ....................................................................................................
---
[00:51:51] ....................................................................................................
[00:52:02] ....................................................................................................
[00:52:12] ....................................................................i........................i......
[00:52:33] ....................................................................................................
[00:52:40] .....................................................................................ii..F.F........
[00:53:01] ....................................................................................................
[00:53:28] ....................................................................................................
[00:53:36] ....................................................................................................
[00:53:46] ....................................................................................................
---
[00:54:04] ....................................................................................................
[00:54:07] ....................................................................................................
00:54:09] The actual stderr differed from the expected stderr.
[00:54:09] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/macros/macro-path-prelude-pass/macro-path-prelude-pass.stderr
[00:54:09] To update references, rerun the tests and pass the `--bless` flag
[00:54:09] To only update this specific test, also pass `--test-args macros/macro-path-prelude-pass.rs`
[00:54:09] error: 1 errors occurred comparing output.
[00:54:09] status: exit code: 0
[00:54:09] status: exit code: 0
[00:54:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/macros/macro-path-prelude-pass.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/macros/macro-path-prelude-pass/a" "-Crpath" "-O" "-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/macros/macro-path-prelude-pass/auxiliary" "-A" "unused"
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] ------------------------------------------
[00:54:09] stderr:
[00:54:09] stderr:
[00:54:09] ------------------------------------------
[00:54:09] {"message":"the feature `extern_prelude` has been stable since 1.30.0 and no longer requires an attribute to enable","code":{"code":"stable_features","explanation":null},"level":"warning","spans":[{"file_name":"/checkout/src/test/ui/macros/macro-path-prelude-pass.rs","byte_start":495,"byte_end":509,"line_start":13,"line_end":13,"column_start":12,"column_end":
[00:54:09] To update references, rerun the tests and pass the `--bless` flag
[00:54:09] To only update this specific test, also pass `--test-args run-pass/extern/extern-prelude-core.rs`
[00:54:09] error: 1 errors occurred comparing output.
[00:54:09] status: exit code: 0
[00:54:09] status: exit code: 0
[00:54:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/run-pass/extern/extern-prelude-core.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/run-pass/extern/extern-prelude-core/a" "-Crpath" "-O" "-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/run-pass/extern/extern-prelude-core/auxiliary" "-A" "unused"
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] ------------------------------------------
[00:54:09] stderr:
[00:54:09] stderr:
[00:54:09] ------------------------------------------
[00:54:09] {"message":"the feature `extern_prelude` has been stable since 1.30.0 and no longer requires an attribute to enable","code":{"code":"stable_features","explanation":null},"level":"warning","spans":[{"file_name":"/checkout/src/test/ui/run-pass/extern/extern-prelude-core.rs","byte_start":490,"byte_end":504,"line_start":12,"line_end":12,"column_start":12,"column_end":26,"is_primary":true,"text":[{"text":"#![feature(extern_prelude, lang_items, start, alloc)]","highlight_start":12,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestioss/extern/extern-prelude-std.rs`
[00:54:09] error: 1 errors occurred comparing output.
[00:54:09] status: exit code: 0
[00:54:09] status: exit code: 0
[00:54:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/run-pass/extern/extern-prelude-std.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/run-pass/extern/extern-prelude-std/a" "-Crpath" "-O" "-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/run-pass/extern/extern-prelude-std/auxiliary" "-A" "unused"
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] ------------------------------------------
[00:54:09] stderr:
[00:54:09] stderr:
[00:54:09] ------------------------------------------
[00:54:09] {"message":"the feature `extern_prelude` has been stable since 1.30.0 and no longer requires an attribute to enable","code":{"code":"stable_features","explanation":null},"level":"warning","spans":[{"file_name":"/checkout/src/test/ui/run-pass/extern/extern-prelude-std.rs","byte_start":490,"byte_end":504,"line_start":12,"line_end":12,"column_start":12,"column_end":26,"is_primary":true,"text":[{"text":"#![feature(extern_prelude)]","highlight_start":12,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"#[warn(stable_features)] on by default","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"warning: the feature `extern_prelude` has been stable since 1.30.0 and no longer requires an attribute to enable\n  --> /checkout/src/test/ui/run-pass/extern/extern-prelude-std.rs:12:12\n   |\nLL | #![feature(extern_prelude)]\n   |            ^^^^^^^^^^^^^^\n   |\n   = note: #[warn(stable_features)] on by default\n\n"}
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] thread '[ui] ui/run-pass/extern/extern-prelude-std.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3205:9
[00:54:09] 
[00:54:09] 
[00:54:09] ---- [ui] ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs stdout ----
[00:54:09] normalized stderr:
[00:54:09] warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer requires an attribute to enable
[00:54:09]   --> $DIR/crate-path-visibility-ambiguity.rs:12:12
[00:54:09]    |
[00:54:09] LL | #![feature(crate_in_paths)]
[00:54:09]    |
[00:54:09]    = note: #[warn(stable_features)] on by default
[00:54:09] 
[00:54:09] 
[00:54:09] 
[00:54:09] 
[00:54:09] 
[00:54:09] The actual stderr differed from the expected stderr.
[00:54:09] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity/crate-path-visibility-ambiguity.stderr
[00:54:09] To update references, rerun the tests and pass the `--bless` flag
[00:54:09] To only update this specific test, also pass `--test-args run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs`
[00:54:09] error: 1 errors occurred comparing output.
[00:54:09] status: exit code: 0
[00:54:09] status: exit code: 0
[00:54:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.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/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity/a" "-Crpath" "-O" "-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/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity/auxiliary" "-A" "unused"
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] ------------------------------------------
[00:54:09] stderr:
[00:54:09] stderr:
[00:54:09] ------------------------------------------
[00:54:09] {"message":"the feature `crate_in_paths` has been stable since 1.30.0 and no longer requires an attribute to enable","code":{"code":"stable_features","explanation":null},"level":"warning","spans":[{"file_name":"/checkout/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs","byte_start":490,"byte_end":504,"line_start":12,"line_end":12,"column_start":12,"column_end":26,"is_primary":true,"text":[{"text":"#![feature(crate_in_paths)]","highlight_start":12,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"#[warn(stable_features)] on by default","code":null,"level":"note","spans":[],"childr4:09] error: 1 errors occurred comparing output.
[00:54:09] status: exit code: 0
[00:54:09] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.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/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute/a" "-Crpath" "-O" "-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/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute/auxiliary" "-A" "unused"
[00:54:09] ------------------------------------------
[00:54:09] 
[00:54:09] ------------------------------------------
[00:54:09] stderr:
[00:54:09] stderr:
[00:54:09] ------------------------------------------
[00:54:09] {"message":"the feature `crate_in_paths` has been stable since 1.30.0 and no longer requires an attribute to enable","code":{"code":"stable_features","explanation":null},"level":"warning","spans":[{"file_name":"/checkout/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs","byte_start":490,"byte_end":504,"line_start":12,"line_end":12,"column_start":12,"column_end":26,"is_primary":true,"text":[{"text":"#![feature(crate_in_paths)]","highlight_start":12,"highlight_end":26}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"#[warn(stable_features)] on by default","code":null,"level":"note","spans":[],"children":[],"/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release
129772 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release
128436 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps
122628 ./obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps
113596 ./obj/build/x86_64-unknown-linux-gnu/stage1-std

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)

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 20, 2018

@bors: r-

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 20, 2018

I'm a bit confused, how did I not hit those locally? oh dear, I forgot to check for extra files on the server that I need to take, I was only looking at existing stderr files that got changed by --bless.

@eddyb eddyb force-pushed the eddyb:oopsie-daisy-stabilize branch from 51abc8a to 3a29043 Sep 20, 2018

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 20, 2018

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 20, 2018

📌 Commit 3a29043 has been approved by alexcrichton

@rpjohnst

This comment has been minimized.

Copy link
Contributor

rpjohnst commented Sep 20, 2018

It looks like this stabilizes the extern::my_crate::a::b syntax as well as ::my_crate::a::b, which I thought was not part of the module changes.

Edit: nevermind, misread the diff. 😅

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 20, 2018

@rpjohnst extern_absolute_paths is ::crate_name::foo, not the extern keyword in paths, the latter is extern_in_paths, still unstable on both editions and untouched by this PR.

bors added a commit that referenced this pull request Sep 21, 2018

Auto merge of #54404 - eddyb:oopsie-daisy-stabilize-beta, r=alexcrichton
[beta] Stabilize crate_in_paths, extern_absolute_paths and extern_prelude on all editions.

Beta backport of #54403.

r? @alexcrichton

bors added a commit to rust-lang/cargo that referenced this pull request Sep 21, 2018

Auto merge of #6068 - eddyb:oopsie-daisy-stabilize, r=alexcrichton
Remove `fix::local_paths_no_fix`, as `crate_in_paths` is getting stabilized.

Needed for rust-lang/rust#54403 (blocking RC1).
Ideally we'd also clean up the tests, e.g. removing `#![feature(rust_2018_preview)]` and `is_nightly` checks, but it's easier to just remove the only failing test (because it tests the feature gate is needed).

@eddyb eddyb force-pushed the eddyb:oopsie-daisy-stabilize branch from adc4785 to 0870121 Sep 21, 2018

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 21, 2018

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 21, 2018

📌 Commit 0870121 has been approved by alexcrichton

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Sep 21, 2018

The job x86_64-gnu-llvm-5.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.
[00:02:15] extracting /checkout/obj/build/cache/2018-09-11/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:15] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:02:15] 
[00:02:15] Caused by:
[00:02:15]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:02:15] Build completed unsuccessfully in 0:00:30
[00:02:15] Makefile:81: recipe for target 'prepare' failed
[00:02:15] make: *** [prepare] Error 1
[00:02:16] Command failed. Attempt 2/5:
[00:02:16] Command failed. Attempt 2/5:
[00:02:17] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:02:17] 
[00:02:17] Caused by:
[00:02:17]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:02:17] Build completed unsuccessfully in 0:00:00
[00:02:17] Makefile:81: recipe for target 'prepare' failed
[00:02:17] make: *** [prepare] Error 1
[00:02:19] Command failed. Attempt 3/5:
[00:02:19] Command failed. Attempt 3/5:
[00:02:19] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:02:19] 
[00:02:19] Caused by:
[00:02:19]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:02:19] Build completed unsuccessfully in 0:00:00
[00:02:19] Makefile:81: recipe for target 'prepare' failed
[00:02:19] make: *** [prepare] Error 1
[00:02:22] Command failed. Attempt 4/5:
[00:02:22] Command failed. Attempt 4/5:
[00:02:22] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:02:22] 
[00:02:22] Caused by:
[00:02:22]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:02:22] Build completed unsuccessfully in 0:00:00
[00:02:22] make: *** [prepare] Error 1
[00:02:22] Makefile:81: recipe for target 'prepare' failed
[00:02:26] Command failed. Attempt 5/5:
[00:02:26] Command failed. Attempt 5/5:
[00:02:26] error: failed to resolve patches for `https://github.com/rust-lang/cargo`
[00:02:26] 
[00:02:26] Caused by:
[00:02:26]   patch for `cargo` in `https://github.com/rust-lang/cargo` did not resolve to any crates. If this is unexpected, you may wish to consult: https://github.com/rust-lang/cargo/issues/4678
[00:02:26] Build completed unsuccessfully in 0:00:00
[00:02:26] Makefile:81: recipe for target 'prepare' failed
[00:02:26] make: *** [prepare] Error 1
[00:02:26] The command has failed after 5 attempts.
---
travis_time:end:08c17716:start=1537568032744130537,finish=1537568032750181895,duration=6051358
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:162064c3
$ 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:20da0f62
travis_time:start:20da0f62
$ 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:0fb04600
$ 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)

@ehuss

This comment has been minimized.

Copy link
Contributor

ehuss commented Sep 21, 2018

This will need all the changes from #54334 if you want to update cargo.

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Sep 21, 2018

@bors: r-

Yeah unfortunately let's land #54334 before landing this to make the cargo update easier

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 22, 2018

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

@eddyb eddyb force-pushed the eddyb:oopsie-daisy-stabilize branch from 0870121 to fa2c246 Sep 22, 2018

@eddyb

This comment has been minimized.

Copy link
Member Author

eddyb commented Sep 22, 2018

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 22, 2018

📌 Commit fa2c246 has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 22, 2018

⌛️ Testing commit fa2c246 with merge 4a6e875...

bors added a commit that referenced this pull request Sep 22, 2018

Auto merge of #54403 - eddyb:oopsie-daisy-stabilize, r=alexcrichton
Stabilize crate_in_paths, extern_absolute_paths and extern_prelude on all editions.

Needed for beta, path-related migrations to Rust 2018 don't work on RC1 without these stabilizations.

r? @aturon cc @nikomatsakis @Centril @alexcrichton
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Sep 22, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 4a6e875 to master...

@bors bors merged commit fa2c246 into rust-lang:master Sep 22, 2018

2 checks passed

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

@eddyb eddyb deleted the eddyb:oopsie-daisy-stabilize branch Sep 22, 2018

ehuss added a commit to ehuss/reference that referenced this pull request Oct 17, 2018

@ehuss ehuss referenced this pull request Oct 17, 2018

Merged

`extern crate` changes. #455

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Oct 17, 2018

A bit late to the punch, but this may have caused a 5-6% decrease in perf across some benchmarks

ehuss added a commit to ehuss/reference that referenced this pull request Nov 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.