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 14 pull requests #58878

Closed
wants to merge 37 commits into from

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

timvermeulen and others added 30 commits February 25, 2019 16:44
Since there is nothing to optimise there...
Co-Authored-By: RalfJung <post@ralfj.de>
This will allow us to send it across threads and measure things like
LLVM time.
…alexcrichton"

This reverts commit fd42f24, reversing
changes made to 0e25a68.
There is no longer a need to append the string `", ..."` to a functions
args as `...` is parsed as an argument and will appear in the functions
arguments.
…r=michaelwoerister

[self-profiler] Make the profiler faster/more efficient

Related to rust-lang#58372

r? @michaelwoerister
…oerister

Use informational target machine for metadata

Since there is nothing to optimise there...

Should fix rust-lang#58323 but haven’t tested locally.

r? @michaelwoerister
…scottmcm

Have all methods of Filter and FilterMap use internal iteration

This PR changes `Filter::{next, next_back, count}` and `FilterMap::{next, next_back}` to all use internal iteration. The `next` and `next_back` methods are changed to directly forward to `try_for_each` and `try_rfold` respectively, using `Result` as the `Try` type. I think that's okay? Alternatively, I could change their implementations to use `LoopState` instead if there's any benefit in doing so.

r? @scottmcm
Replace `s` with `self` in docs for str methods taking self.

Cherry picked from PR rust-lang#58596 which is blocked on some intra-doc link bugs.
allow specifying attributes for tool lints

Needed for clippy to fix `unused_doc_comments` warnings that will be exposed by rust-lang#57882 (and thus unblock it).
Fixed a syntax error in the pin docs
…r=oli-obk

tools/rustbook: deny(rust_2018_idioms)

r? @oli-obk
…t, r=oli-obk

tools/remote-test-{client,server}: deny(rust_2018_idioms)

r? @oli-obk

(+ tiny amount of cleanup)
Fix typo in Vec#resize_with documentation
Forbid duplicating Cargo as a dependency

Fixes rust-lang#53005
Fix C-variadic function printing

There is no longer a need to append the string `", ..."` to a functions
args as `...` is parsed as an argument and will appear in the functions
arguments.

r? @alexreg
cc @alexcrichton
Fixes: rust-lang#58853
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=15

@bors
Copy link
Contributor

bors commented Mar 2, 2019

📌 Commit 8f8f70e has been approved by Mark-Simulacrum

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

bors commented Mar 3, 2019

⌛ Testing commit 8f8f70e with merge 1653e3a0cd54fc76b211763d3d10ec77d116e3e9...

@bors
Copy link
Contributor

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

The job dist-i686-freebsd 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:24:28] rustc exited with signal: 4
[00:24:28] error: Could not compile `std`.
[00:24:28] 
[00:24:28] Caused by:
[00:24:28]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --edition=2018 --crate-name std src/libstd/lib.rs --color always --error-format json --crate-type dylib --crate-type rlib --emit=dep-info,link -C prefer-dynamic -C opt-level=2 --cfg 'feature="backtrace"' --cfg 'feature="backtrace-sys"' --cfg 'feature="compiler_builtins"' --cfg 'feature="compiler_builtins_c"' --cfg 'feature="default"' --cfg 'feature="panic-unwind"' --cfg 'feature="panic_unwind"' --cfg 'feature="std_detect_dlsym_getauxval"' --cfg 'feature="std_detect_file_io"' -C metadata=5bc79d70dd38d8ba -C extra-filename=-5bc79d70dd38d8ba --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps --target i686-unknown-freebsd -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps --extern alloc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/liballoc-95909b7a30bd7765.rlib --extern backtrace_sys=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libbacktrace_sys-967a87e72698f89e.rlib --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libcompiler_builtins-0fe3d3d0b5c79cad.rlib --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libcore-3324900c3287afca.rlib --extern libc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/liblibc-63bf64669fb7fe2a.rlib --extern panic_abort=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libpanic_abort-c0b157d90c798351.rlib --extern panic_unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libpanic_unwind-9855b645da209f46.rlib --extern rustc_demangle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/librustc_demangle-c4292d3162181124.rlib --extern unwind=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/deps/libunwind-de9f58e4e89a4a6e.rlib -l execinfo -l pthread -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/build/compiler_builtins-7f09038fcc6b3b1e/out -L native=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/i686-unknown-freebsd/release/build/backtrace-sys-9151d6ecdd32d163/out` (exit code: 254)
[00:24:28] expected success, got: exit code: 101
[00:24:28] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host i686-unknown-freebsd --target i686-unknown-freebsd
[00:24:28] Build completed unsuccessfully in 0:21:11
travis_time:end:09bc0316:start=1551575127181657694,finish=1551576596632161940,duration=1469450504246
---
travis_time:end:192e4640:start=1551576597474501612,finish=1551576597481082772,duration=6581160
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0295de2f
$ 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.24788.!checkout!obj!build!x86_64-unknown-linux-gnu!stage1!bin!rustc
[New LWP 24794]
[New LWP 24790]
[New LWP 24788]
[New LWP 24789]
[New LWP 24791]
warning: Could not load shared library symbols for 7 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc --edition=2018 --'.
Program terminated with signal SIGILL, Illegal instruction.
#0  0x00007f2480c9c7b8 in rustc_codegen_llvm::back::write::diagnostic_handler::h56cc3fd5e926b08f () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
[Current thread is 1 (LWP 24794)]
#0  0x00007f2480c9c7b8 in rustc_codegen_llvm::back::write::diagnostic_handler::h56cc3fd5e926b08f () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#1  0x00007f248251aea6 in llvm::DiagnosticHandler::handleDiagnostics(llvm::DiagnosticInfo const&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#2  0x00007f248255e9ce in llvm::LLVMContext::diagnose(llvm::DiagnosticInfo const&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#3  0x00007f248255ebda in llvm::LLVMContext::emitError(unsigned int, llvm::Twine const&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#4  0x00007f2481ccd635 in llvm::MachineInstr::emitError(llvm::StringRef) const () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#5  0x00007f2481d91acb in (anonymous namespace)::RegAllocFast::allocVirtReg(llvm::MachineInstr&, (anonymous namespace)::RegAllocFast::LiveReg&, unsigned int) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#6  0x00007f2481d91005 in (anonymous namespace)::RegAllocFast::reloadVirtReg(llvm::MachineInstr&, unsigned int, unsigned int, unsigned int) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#7  0x00007f2481d8f8bb in (anonymous namespace)::RegAllocFast::runOnMachineFunction(llvm::MachineFunction&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#8  0x00007f2481cc2284 in llvm::MachineFunctionPass::runOnFunction(llvm::Function&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#9  0x00007f248256ddb5 in llvm::FPPassManager::runOnFunction(llvm::Function&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#10 0x00007f248256e033 in llvm::FPPassManager::runOnModule(llvm::Module&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#11 0x00007f248256e58f in llvm::legacy::PassManagerImpl::run(llvm::Module&) () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#12 0x00007f2480caab68 in LLVMRustWriteOutputFile () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#13 0x00007f2480c9b1ac in rustc_codegen_llvm::back::write::write_output_file::h77afaa09e14825ef () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#14 0x00007f2480b3af28 in rustc_codegen_llvm::back::write::codegen::_$u7b$$u7b$closure$u7d$$u7d$::h92dda75390544412 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#15 0x00007f2480b32439 in rustc::util::common::time_ext::hfa765c7526deca72 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#16 0x00007f2480c9db92 in rustc_codegen_llvm::back::write::codegen::h9187f670bcb2a1c1 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#17 0x00007f2480be2c70 in rustc_codegen_ssa::back::write::execute_work_item::hf18b6b305a19139d () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#18 0x00007f2480b998cf in std::sys_common::backtrace::__rust_begin_short_backtrace::h46aa12e23c49dd81 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#19 0x00007f2480bc6f14 in std::panicking::try::do_call::h2f1771387e1c8b59 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#20 0x00007f248d2bc50a in __rust_maybe_catch_panic () at src/libpanic_unwind/lib.rs:87
#21 0x00007f2480b694e8 in _$LT$F$u20$as$u20$alloc..boxed..FnBox$LT$A$GT$$GT$::call_box::hf53da617d00c4875 () from ./checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
#22 0x00007f248d2bb20e in _$LT$alloc..boxed..Box$LT$$LP$dyn$u20$alloc..boxed..FnBox$LT$A$C$$u20$Output$u3d$R$GT$$u20$$u2b$$u20$$u27$_$RP$$GT$$u20$as$u20$core..ops..function..FnOnce$LT$A$GT$$GT$::call_once::h049526ed6a4ac59d () at /rustc/1653e3a0cd54fc76b211763d3d10ec77d116e3e9/src/liballoc/boxed.rs:759
#23 std::sys_common::thread::start_thread::h0fe568fee6370201 () at src/libstd/sys_common/thread.rs:14
#24 std::sys::unix::thread::Thread::new::thread_start::hf0316e9d9388a26f () at src/libstd/sys/unix/thread.rs:80
#25 0x00007f2486fa76db in ?? ()
#26 0x0000000000000000 in ?? ()
travis_time:end:0295de2f:start=1551576597487275928,finish=1551576599276855739,duration=1789579811
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1cae514e
travis_time:start:1cae514e
$ 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:0762b45f
$ 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)

@Centril Centril closed this Mar 3, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.