Change the --unpretty flag to -Z unpretty #47440
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @michaelwoerister (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. |
|
@bors r+ |
|
📌 Commit 0913d67 has been approved by |
|
Nice! |
kennytm
added
the
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #47035) made this pull request unmergeable. Please resolve the merge conflicts. |
kennytm
added
S-waiting-on-author
|
@bors retry |
|
@mark-i-m: 🔑 Insufficient privileges: and not in try users |
src/librustc/session/config.rs
Outdated
| @@ -1256,6 +1256,9 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, | |||
| `everybody_loops` (all function bodies replaced with `loop {}`), | |||
| `hir` (the HIR), `hir,identified`, or | |||
| `hir,typed` (HIR with types for each node)."), | |||
| dep_info_omit_d_target: bool = (false, parse_bool, [TRACKED], | |||
There was a problem hiding this comment.
this looks... like a merge gone wrong? :)
There was a problem hiding this comment.
@nikomatsakis I'm not sure I understand... This was the merge conflict. Am I missing something?
There was a problem hiding this comment.
Huh, I think I was confused. I was reading it as if the line had been injected in the wrong place.
|
@nikomatsakis I think this is waiting on @bors now, right? Is there anything left for me to do? |
|
@mark-i-m actually, can you rebase instead of merging? we don't usually allow merge commits in the history. And then I can r+ again. |
-Z unpretty no longer requires -Z unstable-options. Also, I mildly changed the syntax of the flag to match the other -Z flags. All uses of the flag take the form `unpretty=something` where something can either `string` or `string=string` (see the help messages of the CLI).
|
@nikomatsakis Done :) Thanks! |
|
@bors r+ |
|
📌 Commit ebfa6c7 has been approved by |
nikomatsakis
added
S-waiting-on-bors
Change the --unpretty flag to -Z unpretty First PR 😄 ! -Z unpretty no longer requires -Z unstable-options. Also, I mildly changed the syntax of the flag to match the other -Z flags. All uses of the flag take the form `unpretty=something` where something can either `string` or `string=string` (see the help messages of the CLI). Fix rust-lang#47395 r? @nikomatsakis EDIT: apparently rust-highfive doesn't see edits...
First PR 😄 !
-Z unpretty no longer requires -Z unstable-options.
Also, I mildly changed the syntax of the flag to match the other -Z flags. All uses of the flag take the form
unpretty=somethingwhere something can eitherstringorstring=string(see the help messages of the CLI).Fix #47395
r? @nikomatsakis EDIT: apparently rust-highfive doesn't see edits...