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

Deny bare trait objects in src/librustc_errors #52286

Merged
merged 1 commit into from
Jul 17, 2018

Conversation

ljedrz
Copy link
Contributor

@ljedrz ljedrz commented Jul 12, 2018

Enforce #![deny(bare_trait_objects)] in src/librustc_errors.

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 12, 2018
@rust-highfive
Copy link
Collaborator

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:04:00] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:00] tidy error: /checkout/src/librustc_errors/lib.rs:342: line longer than 100 chars
[00:04:02] some tidy checks failed
[00:04:02] 
[00:04:02] 
[00:04:02] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:04:02] 
[00:04:02] 
[00:04:02] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:02] Build completed unsuccessfully in 0:00:50
[00:04:02] Build completed unsuccessfully in 0:00:50
[00:04:02] make: *** [tidy] Error 1
[00:04:02] Makefile:79: recipe for target 'tidy' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:21971a0f
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:01eccd38:start=1531381193036207499,finish=1531381193043976366,duration=7768867
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1b4f1f70
$ head -30 ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
head: cannot open ‘./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers’ for reading: No such file or directory
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0a1774d3
$ 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)

@varkor
Copy link
Member

varkor commented Jul 13, 2018

Can you squash these two commits? Everything else looks good, thanks!

@ljedrz
Copy link
Contributor Author

ljedrz commented Jul 13, 2018

@varkor I'm all for it, though my git-foo is not too advanced yet; can you please check if I did it correctly? If it's ok, I'll do the same with the other PR you asked to squash.

@varkor
Copy link
Member

varkor commented Jul 13, 2018

@ljedrz: when you've squashed your commits, you should just see 1 commit as part of the GitHub pull request. You've done something with merging instead. This article walks through it. In your case, you should be able to do something like:

git rebase -i HEAD~4

and then change pick to squash for the last 3 commits.

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_errors`.
@ljedrz ljedrz force-pushed the dyn_librustc_errors branch from 82b42cb to 0339244 Compare July 14, 2018 05:26
@ljedrz
Copy link
Contributor Author

ljedrz commented Jul 14, 2018

I think I got this now, thanks!

@varkor
Copy link
Member

varkor commented Jul 16, 2018

Great, thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 16, 2018

📌 Commit 0339244 has been approved by varkor

@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 Jul 16, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jul 17, 2018
Deny bare trait objects in src/librustc_errors

Enforce `#![deny(bare_trait_objects)]` in `src/librustc_errors`.
bors added a commit that referenced this pull request Jul 17, 2018
Rollup of 9 pull requests

Successful merges:

 - #52286 (Deny bare trait objects in src/librustc_errors)
 - #52306 (Reduce the number of clone()s needed in obligation_forest)
 - #52338 (update miri)
 - #52385 (Pass edition flags to compiler from rustdoc as expected)
 - #52392 (AsRef doc wording tweaks)
 - #52430 (update nomicon)
 - #52434 (Enable incremental independent of stage)
 - #52435 (Calculate the exact capacity for 2 HashMaps)
 - #52446 (Block beta if clippy breaks.)

r? @ghost
@bors bors merged commit 0339244 into rust-lang:master Jul 17, 2018
@ljedrz ljedrz deleted the dyn_librustc_errors branch July 17, 2018 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants