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 32 pull requests #56775

Closed
wants to merge 76 commits into from
Closed

Rollup of 32 pull requests #56775

wants to merge 76 commits into from

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Dec 13, 2018

Successful merges:

yui-knk and others added 30 commits November 29, 2018 08:54
`mir_stats` mod has not been used since c1ff104.
Filter out `ProcMacroStub`s to avoid an ICE during cleaning.

Also add proc macros to `cache().paths` so it can generate links.
Popping and pushing from the end of a linked list is constant time. This
documentation is already there for popping and pushing from the front.

@bors: r+ 38fe8d2 rollup
Also, provide a suggestion for the correct syntax.
Initially, rust-lang#50233 accidentally changed the capacity of empty ZST. This
was pointed out during code review. This commit adds a test to prevent
capacity of ZST vectors from accidentally changing to prevent that
from happening again.
@bors
Copy link
Contributor

bors commented Dec 13, 2018

📌 Commit 055e288 has been approved by kennytm

@kennytm kennytm changed the title Rollup of 29 pull requests Rollup of 30 pull requests Dec 13, 2018
…ker-flavor, r=nagisa

Stabilize `linker-flavor` flag.

Part of rust-lang#55396.

This commit moves the linker-flavor flag from a debugging option to a
codegen option, thus stabilizing it. There are no feature flags
associated with this flag.
… r=kennytm

Add short emoji status to toolstate updates

I get a lot of these emails and it's good to know which ones I should be paying closer attention to -- i.e. the ones where clippy breaks. This adds a short emoji status report to the first line of the commit message, which shows up in notifications directly

I haven't been able to test it, and the actual emoji are just suggestions.
@kennytm kennytm changed the title Rollup of 30 pull requests Rollup of 32 pull requests Dec 13, 2018
@kennytm
Copy link
Member Author

kennytm commented Dec 13, 2018

@bors r+

Added #56351, #56758.

@bors
Copy link
Contributor

bors commented Dec 13, 2018

📌 Commit 8caa657 has been approved by kennytm

@kennytm kennytm changed the title Rollup of 32 pull requests Rollup of 34 pull requests Dec 13, 2018
@kennytm
Copy link
Member Author

kennytm commented Dec 13, 2018

@bors r+

Added #56783, #56490

@bors
Copy link
Contributor

bors commented Dec 13, 2018

📌 Commit d05956190581cdf14dca91eb2f56821695b06215 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Dec 13, 2018

⌛ Testing commit d05956190581cdf14dca91eb2f56821695b06215 with merge 2353402c413985843641c4e23df6b0310b6d8a52...

@bors
Copy link
Contributor

bors commented Dec 13, 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 13, 2018
@kennytm kennytm changed the title Rollup of 34 pull requests Rollup of 32 pull requests Dec 13, 2018
@kennytm
Copy link
Member Author

kennytm commented Dec 13, 2018

@bors r+

Removed #56783 (already testing)
Removed #56490 (causing the error above)

@bors
Copy link
Contributor

bors commented Dec 13, 2018

📌 Commit 8caa657 has been approved by kennytm

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

bors commented Dec 13, 2018

⌛ Testing commit 8caa657 with merge ab187f7479c89404d9d6a44a5cb88eb3c21ac797...

@bors
Copy link
Contributor

bors commented Dec 13, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux 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:39]                                                         ^^^^^^^^^^^^
[01:24:39]     = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
[01:24:39] 
[01:24:40]  Documenting arena v0.0.0 (/checkout/src/libarena)
[01:24:41] thread '<unnamed>' panicked at 'assertion failed: output.is_none()', src/librustdoc/clean/simplify.rs:108:21
[01:24:41] 
[01:24:41] error: internal compiler error: unexpected panic
[01:24:41] 
[01:24:41] error: Unrecognized option: 'document-private-items'
[01:24:41] error: Unrecognized option: 'document-private-items'
[01:24:41] 
[01:24:41] error: Could not document `rustc_codegen_llvm`.
[01:24:41] 
[01:24:41] Caused by:
[01:24:41]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --crate-name rustc_codegen_llvm src/librustc_codegen_llvm/lib.rs --color always --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/doc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps --extern cc=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libcc-c6f14bfbea71a5d2.rmeta --extern memmap=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libmemmap-f1ce0e7d8602fc1f.rmeta --extern num_cpus=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/libnum_cpus-2f51f01ec1efde74.rmeta --extern rustc_demangle=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_demangle-d7f65c515e37a89e.rmeta --extern rustc_llvm=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_llvm-98200b85279ce65f.rmeta --document-private-items` (exit code: 1)
[01:24:42] [RUSTC-TIMING] rustc_target test:false 4.272
[01:24:44] error: build failed
[01:24:44] 
[01:24:44] 
[01:24:44] 
[01:24:44] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "rustc" "-p" "rustc_codegen_ssa" "-p" "syntax_pos" "-p" "rustc_apfloat" "-p" "rustc_mir" "-p" "graphviz" "-p" "serialize" "-p" "rustc_typeck" "-p" "rustc_errors" "-p" "rustc_plugin" "-p" "fmt_macros" "-p" "rustc_fs_util" "-p" "rustc_save_analysis" "-p" "rustc_target" "-p" "rustc_driver" "-p" "syntax_ext" "-p" "rustc_llvm" "-p" "rustc_data_structures" "-p" "rustc_allocator" "-p" "rustc_privacy" "-p" "rustc_borrowck" "-p" "syntax" "-p" "rustc_platform_intrinsics" "-p" "arena" "-p" "rustc_resolve" "-p" "rustc_passes" "-p" "rustc_codegen_llvm" "-p" "rustc_incremental" "-p" "rustc_metadata" "-p" "rustc_codegen_utils" "-p" "rustc_lint" "-p" "build_helper" "-p" "rustc_traits"
[01:24:44] 
[01:24:44] 
[01:24:44] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
[01:24:44] Build completed unsuccessfully in 1:19:46
---
travis_time:end:033626c3:start=1544737670285052753,finish=1544737670291532419,duration=6479666
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0059858a
$ 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:086109e2
travis_time:start:086109e2
$ 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:15736908
$ 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 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 13, 2018
@bors
Copy link
Contributor

bors commented Dec 14, 2018

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

@kennytm kennytm closed this Dec 14, 2018
@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.