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

Rollup of 11 pull requests #56557

Merged
merged 39 commits into from
Dec 6, 2018
Merged

Rollup of 11 pull requests #56557

merged 39 commits into from
Dec 6, 2018

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

weiznich and others added 30 commits November 28, 2018 17:10
* Create output directories for crates beforehand so rustdoc uses relative links
* Readd rustc_codegen_ssa
* Don't build out of tree dependencies for rustdoc like we don't for rustc
dropping the param-env on the floor is obviously the wrong thing to do.

The ICE was probably exposed by rust-lang#54490 adding the problem-exposing use of
`traits::find_associated_item`.

Fixes rust-lang#55380.
`CrateRoot` -> `PathRoot`, `::` doesn't necessarily mean crate root now
`SelfValue` -> `SelfLower`, `SelfType` -> `SelfUpper`, both `self` and `Self` can be used in type and value namespaces now
`Edition` is not a public API, we want users to break when a new edition is added
…ort, r=QuietMisdreavus

Rustdoc inline macro reexport

Fixes rust-lang#56173

I assume this needs to have tests? Any pointers where these need to be added?
…, r=QuietMisdreavus

[rustdoc] Specific crate search

Reopening of rust-lang#54706.
Fixes rust-lang#54616.

<img width="1440" alt="screenshot 2018-11-29 at 01 29 11" src="https://user-images.githubusercontent.com/3050060/49191372-979adf80-f376-11e8-963e-e4feb927c1da.png">

r? @QuietMisdreavus
…, r=Mark-Simulacrum

Don't print the profiling summary to stdout when -Zprofile-json is set

cc rust-lang/rustc-perf#299
@pietroalbini
Copy link
Member Author

@bors r+ p=11

@bors
Copy link
Contributor

bors commented Dec 6, 2018

📌 Commit cd1ee5e 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 Dec 6, 2018
@bors
Copy link
Contributor

bors commented Dec 6, 2018

⌛ Testing commit cd1ee5e with merge 3980162e50b4c2eeea0f9234596ea98e63af2553...

@bors
Copy link
Contributor

bors commented Dec 6, 2018

💔 Test failed - status-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 Dec 6, 2018
@rust-highfive
Copy link
Collaborator

The job dist-i586-gnu-i586-i686-musl 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:24:45] test atomic::int_xor ... ok
[01:24:45] test atomic::uint_xor ... ok
[01:24:45] test cell::as_ptr ... ok
[01:24:45] test cell::cell_default ... ok
[01:24:45] error: process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i686-unknown-linux-musl/release/deps/coretests-63755902709cf13f` (signal: 11, SIGSEGV: invalid memory reference)
[01:24:45] 
[01:24:45] 
[01:24:45] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "i686-unknown-linux-musl" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "core" "--"
[01:24:45] 
[01:24:45] 
[01:24:45] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target i586-unknown-linux-gnu,i686-unknown-linux-musl
[01:24:45] Build completed unsuccessfully in 1:22:18
---
travis_time:end:0895781c:start=1544091445898067752,finish=1544091445908477484,duration=10409732
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:11e72e79
$ 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:start:crashlog
obj/cores/core.16853.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2-std!i686-unknown-linux-musl!release!deps!coretests-63755902709cf13f
warning: core file may not match specified executable file.
[New LWP 16853]
Core was generated by `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/i686-unknown-linux-musl'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x08180577 in unbin (i=20, c=0xa140e28) at src/malloc/malloc.c:195
195 src/malloc/malloc.c: No such file or directory.
#0  0x08180577 in unbin (i=20, c=0xa140e28) at src/malloc/malloc.c:195
#1  alloc_fwd (c=c@entry=0xa140e28) at src/malloc/malloc.c:208
#2  0x08180b67 in __bin_chunk (self=0xa140e18) at src/malloc/malloc.c:475
#3  0x0816b08c in dealloc () at src/libstd/sys/unix/alloc.rs:48
#4  __rdl_dealloc () at src/libstd/alloc.rs:250
#5  0x0814393b in dealloc () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/liballoc/alloc.rs:100
#6  dealloc () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/liballoc/alloc.rs:163
#7  dealloc_buffer<u8,alloc::alloc::Global> () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/liballoc/raw_vec.rs:720
#8  drop<u8,alloc::alloc::Global> () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/liballoc/raw_vec.rs:729
#9  real_drop_in_place<alloc::raw_vec::RawVec<u8, alloc::alloc::Global>> () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/libcore/ptr.rs:204
#10 real_drop_in_place<alloc::vec::Vec<u8>> () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/libcore/ptr.rs:204
#11 real_drop_in_place<alloc::string::String> () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/libcore/ptr.rs:204
#12 write_log_result () at src/libtest/lib.rs:765
#13 callback () at src/libtest/lib.rs:893
#14 test::run_tests_console::_$u7b$$u7b$closure$u7d$$u7d$::hb89cc2dd1ff461b4 () at src/libtest/lib.rs:962
#15 0x08141d38 in run_tests<closure> () at src/libtest/lib.rs:1183
#16 test::run_tests_console::h0dc90a4f4dc31a37 () at src/libtest/lib.rs:962
#17 0x08139b32 in test::test_main::h9b47a6f3fe9c4633 () at src/libtest/lib.rs:295
#18 0x0813a217 in test::test_main_static::h1d8e3a282e70df52 () at src/libtest/lib.rs:329
#19 0x081235b5 in coretests::main::h5c6648a2b7e7dc8d ()
#20 0x08048706 in std::rt::lang_start::_$u7b$$u7b$closure$u7d$$u7d$::h9ac46be54d239592 () at /rustc/3980162e50b4c2eeea0f9234596ea98e63af2553/src/libstd/rt.rs:74
#21 0x081699f7 in {{closure}} () at src/libstd/rt.rs:59
#22 std::sys_common::backtrace::__rust_begin_short_backtrace::hd0798e53180da0b9 () at src/libstd/sys_common/backtrace.rs:136
#23 0x0816b830 in {{closure}} () at src/libstd/rt.rs:59
#24 std::panicking::try::do_call::h557d0eee47877685 () at src/libstd/panicking.rs:310
#25 0x08177883 in __rust_maybe_catch_panic () at src/libpanic_unwind/lib.rs:102
#26 0x0816c1b9 in try<i32,closure> () at src/libstd/panicking.rs:289
#27 catch_unwind<closure,i32> () at src/libstd/panic.rs:398
#28 std::rt::lang_start_internal::h1a0ed73fddfccda7 () at src/libstd/rt.rs:58
#29 0x081235fb in main ()
travis_time:end:11e72e79:start=1544091445917630172,finish=1544091446810911112,duration=893280940
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0775db98
travis_time:start:0775db98
$ 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:016cfc94
$ 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)

@pietroalbini
Copy link
Member Author

@bors retry

A segfault in libcore's tests? Wut? Nothing in this rollup changes that.

@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 Dec 6, 2018
@bors
Copy link
Contributor

bors commented Dec 6, 2018

⌛ Testing commit cd1ee5e with merge 367e783...

bors added a commit that referenced this pull request Dec 6, 2018
Rollup of 11 pull requests

Successful merges:

 - #56315 (Rustdoc inline macro reexport)
 - #56332 ([rustdoc] Specific crate search)
 - #56362 (Stabilise exhaustive integer patterns)
 - #56426 (libsyntax_pos: A few tweaks)
 - #56441 (rustbuild: Fix issues with compiler docs)
 - #56446 (pass the parameter environment to `traits::find_associated_item`)
 - #56500 (cleanup: remove static lifetimes from consts)
 - #56525 (Avoid extra copy and syscall in std::env::current_exe)
 - #56528 (Remove unused dependency (rustc_lint -> rustc_mir))
 - #56548 (Optimized string FromIterator + Extend impls)
 - #56553 (Don't print the profiling summary to stdout when -Zprofile-json is set)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 6, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 367e783 to master...

@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #56557!

Tested on commit 367e783.
Direct link to PR: #56557

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 6, 2018
Tested on commit rust-lang/rust@367e783.
Direct link to PR: <rust-lang/rust#56557>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
@bors bors merged commit cd1ee5e into rust-lang:master Dec 6, 2018
@pietroalbini pietroalbini deleted the rollup branch December 6, 2018 15:09
@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
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.