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

Add missing unpretty option help message #57598

Merged
merged 1 commit into from Jan 19, 2019

Conversation

Projects
None yet
4 participants
@h-michael
Copy link
Contributor

h-michael commented Jan 14, 2019

There are some missing help messages that is printed ructc -Zunpretty help and receiving invalid option.

related with #16419, #45721, #21085, #31916

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 14, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @oli-obk (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@h-michael h-michael force-pushed the h-michael:unpretty-help branch from 35c7eb9 to 2b27e6e Jan 14, 2019

@oli-obk
Copy link
Contributor

oli-obk left a comment

Just a few nits, lgtm otherwise

Show resolved Hide resolved src/librustc/session/config.rs Outdated
Show resolved Hide resolved src/librustc/session/config.rs Outdated
Show resolved Hide resolved src/librustc/session/config.rs Outdated

@h-michael h-michael force-pushed the h-michael:unpretty-help branch from 2b27e6e to 3bd6085 Jan 14, 2019

@h-michael

This comment has been minimized.

Copy link
Contributor Author

h-michael commented Jan 14, 2019

@oli-obk Thanks for your so quick review.
I've fixed it.

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Jan 14, 2019

The job x86_64-gnu-llvm-6.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.
travis_fold:start:worker_info
Worker information
hostname: eec0f2d9-1897-4532-8b04-afc067312976@1.production-1-worker-com-gce-83fd
version: v6.2.0 https://github.com/travis-ci/worker/tree/5e5476e01646095f48eec13196fdb3faf8f5cbf7
instance: travis-job-00ff0a13-145c-48a0-a5e6-bc1ccd526706 travis-ci-stevonnie-xenial-1547455581-2c98a19 (via amqp)
travis_fold:end:worker_info
travis_fold:start:system_info
Build system information
Build language: shell
---
nvm version
0.34.0
perlbrew version
/home/travis/perl5/perlbrew/bin/perlbrew  - App::perlbrew/0.85
phpenv version
rbenv 1.1.1-39-g59785f6
rvm 1.29.7 (latest) by Michal Papis, Piotr Kuczynski, Wayne E. Seguin [https://rvm.io]
default ruby version
ruby 2.5.3p105 (2018-10-18 revision 65156) [x86_64-linux]
travis_fold:end:system_info
---
travis_time:end:18ff9b5b:start=1547479011664861308,finish=1547479012792918611,duration=1128057303
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:05:40]    Compiling arena v0.0.0 (/checkout/src/libarena)
[00:05:41]    Compiling syntax_pos v0.0.0 (/checkout/src/libsyntax_pos)
[00:05:45]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:07:06]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:07:07] error: no rules expected the token `,`
[00:07:07]     --> src/librustc/session/config.rs:1353:64
[00:07:07] 696  | macro_rules! options {
[00:07:07]      | -------------------- when calling this macro
[00:07:07] ...
[00:07:07] ...
[00:07:07] 1353 |         `mir` (the MIR), or `mir-cfg` (graphviz formatted MIR)",
[00:07:07]      |                                                                ^ no rules expected this token in macro call
[00:07:08] error: aborting due to previous error
[00:07:08] 
[00:07:08] error: Could not compile `rustc`.
[00:07:08] warning: build failed, waiting for other jobs to finish...
---
186348 ./obj/build/cache/2019-01-04
162588 ./obj/build/bootstrap/debug/incremental
153280 ./src/tools/clang
146472 ./obj/build/bootstrap/debug/incremental/bootstrap-1o7ipylf5x405
146468 ./obj/build/bootstrap/debug/incremental/bootstrap-1o7ipylf5x405/s-f8ja3r10vc-gipfiu-1e6r9o7pag48r
110108 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
107424 ./src/tools/lldb
95108 ./src/tools/clang/test
89976 ./src/llvm-emscripten/test/CodeGen

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)

@h-michael h-michael force-pushed the h-michael:unpretty-help branch from 3bd6085 to 30991ad Jan 14, 2019

@h-michael

This comment has been minimized.

Copy link
Contributor Author

h-michael commented Jan 15, 2019

@oli-obk Thanks for your review.
This is my first PR for rust.
So I don't know so match review process.
According to CONTRIBUTING.md, do I had you write @ bors +r?
Or is there anything which I should do?

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Jan 15, 2019

According to CONTRIBUTING.md, do I had you write @ bors +r?

Once the PR is in a state where it can be merged, I will send it off to bors, yes. You don't need to worry about bors for now, I'll take care of that.

Or is there anything which I should do?

I left a few comments, you can click the Commit suggestion button to apply the changes (or you can manually change the code on your computer if you prefer).

@h-michael

This comment has been minimized.

Copy link
Contributor Author

h-michael commented Jan 15, 2019

I left a few comments, you can click the Commit suggestion button to apply the changes (or you can manually change the code on your computer if you prefer).

Oh, I'm sorry, I overlooked that one. 🙇

@h-michael h-michael force-pushed the h-michael:unpretty-help branch from 30991ad to 260fb31 Jan 15, 2019

@h-michael

This comment has been minimized.

Copy link
Contributor Author

h-michael commented Jan 15, 2019

@oli-obk sorry, I fixed it.

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Jan 15, 2019

@bors r+

Thanks!

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 15, 2019

📌 Commit 260fb31 has been approved by oli-obk

Centril added a commit to Centril/rust that referenced this pull request Jan 15, 2019

Rollup merge of rust-lang#57598 - h-michael:unpretty-help, r=oli-obk
Add missing unpretty option help message

There are some missing help messages that is printed `ructc -Zunpretty help` and receiving invalid option.

related with rust-lang#16419, rust-lang#45721, rust-lang#21085, rust-lang#31916

bors added a commit that referenced this pull request Jan 16, 2019

Auto merge of #57637 - Centril:rollup, r=Centril
Rollup of 6 pull requests

Successful merges:

 - #56884 (rustdoc: overhaul code block lexing errors)
 - #57065 (Optimize try_mark_green and eliminate the lock on dep node colors)
 - #57107 (Add a regression test for mutating a non-mut #[thread_local])
 - #57268 (Add a target option "merge-functions", and a corresponding -Z flag (works around #57356))
 - #57551 (resolve: Add a test for issue #57539)
 - #57598 (Add missing unpretty option help message)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jan 19, 2019

Rollup merge of rust-lang#57598 - h-michael:unpretty-help, r=oli-obk
Add missing unpretty option help message

There are some missing help messages that is printed `ructc -Zunpretty help` and receiving invalid option.

related with rust-lang#16419, rust-lang#45721, rust-lang#21085, rust-lang#31916

bors added a commit that referenced this pull request Jan 19, 2019

Auto merge of #57755 - Centril:rollup, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #57486 (Simplify `TokenStream` some more)
 - #57502 (make trait-aliases work across crates)
 - #57598 (Add missing unpretty option help message)
 - #57649 (privacy: Account for associated existential types)
 - #57659 (Fix release manifest generation)
 - #57699 (add applicability to remaining suggestions)
 - #57719 (Tweak `expand_node`)

Failed merges:

r? @ghost

@bors bors merged commit 260fb31 into rust-lang:master Jan 19, 2019

@h-michael h-michael deleted the h-michael:unpretty-help branch Jan 20, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.