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

Replace usages of 'bad_style' with 'nonstandard_style'. #53786

Merged
merged 1 commit into from
Aug 31, 2018

Conversation

frewsxcv
Copy link
Member

bad_style is being deprecated in favor of nonstandard_style:

@rust-highfive
Copy link
Collaborator

r? @estebank

(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 Aug 29, 2018
@frewsxcv
Copy link
Member Author

r? @Manishearth

@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:18:01]    Compiling rustc_lint v0.0.0 (file:///checkout/src/librustc_lint)
[00:18:01] error[E0583]: file not found for module `nonstandard_style`
[00:18:01]   --> librustc_lint/lib.rs:65:5
[00:18:01]    |
[00:18:01] 65 | mod nonstandard_style;
[00:18:01]    |
[00:18:01]    |
[00:18:01]    = help: name the file either nonstandard_style.rs or nonstandard_style/mod.rs inside the directory "librustc_lint"
[00:18:01] error: aborting due to previous error
[00:18:01] 
[00:18:01] For more information about this error, try `rustc --explain E0583`.
[00:18:01] error: Could not compile `rustc_lint`.
---
travis_time:end:08132420:start=1535550364862786772,finish=1535550364873001085,duration=10214313
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10e84d20
$ 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 -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:0e87c9b2
travis_time:start:0e87c9b2
$ 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:0d3f661e
$ dmesg | grep -i kill
$ dmesg | grep -i kill
[   10.693508] init: failsafe main process (1096) killed by TERM signal
[   42.140982] init: plymouth-upstart-bridge main process (509) killed by TERM signal
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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)

`bad_style` is being deprecated in favor of `nonstandard_style`:

- rust-lang#41646
@frewsxcv frewsxcv force-pushed the frewsxcv-bad-style branch from d4d2ff5 to e477a13 Compare August 29, 2018 14:01
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 29, 2018

📌 Commit e477a13 has been approved by Manishearth

@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 Aug 29, 2018
@frewsxcv
Copy link
Member Author

@bors rollup

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 29, 2018
…shearth

Replace usages of 'bad_style' with 'nonstandard_style'.

`bad_style` is being deprecated in favor of `nonstandard_style`:

- rust-lang#41646
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 29, 2018
…shearth

Replace usages of 'bad_style' with 'nonstandard_style'.

`bad_style` is being deprecated in favor of `nonstandard_style`:

- rust-lang#41646
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 30, 2018
…shearth

Replace usages of 'bad_style' with 'nonstandard_style'.

`bad_style` is being deprecated in favor of `nonstandard_style`:

- rust-lang#41646
bors added a commit that referenced this pull request Aug 31, 2018
Rollup of 20 pull requests

Successful merges:

 - #51760 (Add another PartialEq example)
 - #53113 (Add example for Cow)
 - #53129 (remove `let x = baz` which was obscuring the real error)
 - #53389 (document effect of join on memory ordering)
 - #53472 (Use FxHash{Map,Set} instead of the default Hash{Map,Set} everywhere in rustc.)
 - #53476 (Add partialeq implementation for TryFromIntError type)
 - #53513 (Force-inline `shallow_resolve` at its hottest call site.)
 - #53655 (set applicability)
 - #53702 (Fix stabilisation version for macro_vis_matcher.)
 - #53727 (Do not suggest dereferencing in macro)
 - #53732 (save-analysis: Differentiate foreign functions and statics.)
 - #53740 (add llvm-readobj to llvm-tools-preview)
 - #53743 (fix a typo: taget_env -> target_env)
 - #53747 (Rustdoc fixes)
 - #53753 (expand keep-stage --help text)
 - #53756 (Fix typo in comment)
 - #53768 (move file-extension based .gitignore down to src/)
 - #53785 (Fix a comment in src/libcore/slice/mod.rs)
 - #53786 (Replace usages of 'bad_style' with 'nonstandard_style'.)
 - #53806 (Fix UI issues on Implementations on Foreign types)

Failed merges:

r? @ghost
@bors bors merged commit e477a13 into rust-lang:master Aug 31, 2018
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.

5 participants