Skip to content

Rollup of 4 pull requests - #59579

Closed
Centril wants to merge 12 commits into
rust-lang:masterfrom
Centril:rollup
Closed

Rollup of 4 pull requests#59579
Centril wants to merge 12 commits into
rust-lang:masterfrom
Centril:rollup

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

stepnivlkand others added 12 commits March 16, 2019 19:16
Remove unnecessary comment
This commit extends the existing generic re-ordering diagnostic to
include any bounds on the generic parameter, thus producing correct
suggestions.
This commit updates the generic parameter re-ordering diagnostic to only
mention const generics if the feature is enabled.
…ths-libstd, r=oli-obk
libstd: deny(elided_lifetimes_in_paths)
r? @oli-obk
…i-obk
Mention `no merge policy` in the CONTRIBUTING guide
Issue: rust-lang#59233
Include bounds in generic re-ordering diagnostic
Fixesrust-lang#59508.
r? @estebank
cc @varkor
…ing, r=Centril
Distinguish message for external macros depending on error level
fixesrust-lang#57716
(I picked you because assigned to this issue.)
r? @estebank
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4

@bors

bors commented Mar 31, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit f3d6ed1 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 31, 2019
@bors

bors commented Mar 31, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f3d6ed1 with merge ebbacf5810f730f140dd689edbfc4a5ce8b27dd4...

@bors

bors commented Mar 31, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

Copy link
Copy Markdown
Contributor

The job dist-various-1 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:1dec2128:start=1554035347009829145,finish=1554035347026128456,duration=16299311
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:16036390
$ 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:1553bcc7
travis_time:start:1553bcc7
$ 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:241024d4
$ 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)

@borsbors 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 31, 2019
@CentrilCentril closed this Mar 31, 2019
@Centril
Centril deleted the rollup branch March 31, 2019 12:32
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@Centril@bors@rust-highfive@JohnTitor@davidtwco