Skip to content

Change the --unpretty flag to -Z unpretty - #47440

Merged
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:zunpretty
Jan 23, 2018
Merged

Change the --unpretty flag to -Z unpretty#47440
bors merged 1 commit into
rust-lang:masterfrom
mark-i-m:zunpretty

Conversation

@mark-i-m

@mark-i-mmark-i-m commented Jan 15, 2018•
edited
Loading

Copy link
Copy Markdown
Contributor

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#47395

r? @nikomatsakis EDIT: apparently rust-highfive doesn't see edits...

@rust-highfive

rust-highfive commented Jan 15, 2018

Copy link
Copy Markdown
Contributor

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.

@mark-i-m

mark-i-m commented Jan 15, 2018

Copy link
Copy Markdown
ContributorAuthor

r? @nikomatsakis

@nikomatsakis

nikomatsakis commented Jan 16, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 16, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 0913d67 has been approved by nikomatsakis

@nikomatsakis

nikomatsakis commented Jan 16, 2018

Copy link
Copy Markdown
Contributor

Nice!

@kennytmkennytm added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 17, 2018
@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #47035) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytmkennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 17, 2018
@mark-i-m

mark-i-m commented Jan 17, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@bors

bors commented Jan 17, 2018

Copy link
Copy Markdown
Collaborator

@mark-i-m: 🔑 Insufficient privileges: and not in try users

nikomatsakis
nikomatsakis reviewed Jan 17, 2018
View reviewed changes
Comment threadsrc/librustc/session/config.rs Outdated

@nikomatsakisnikomatsakisJan 17, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks... like a merge gone wrong? :)

@mark-i-mmark-i-mJan 17, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nikomatsakis I'm not sure I understand... This was the merge conflict. Am I missing something?

@nikomatsakisnikomatsakisJan 17, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, I think I was confused. I was reading it as if the line had been injected in the wrong place.

@mark-i-m

mark-i-m commented Jan 18, 2018

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis I think this is waiting on @bors now, right? Is there anything left for me to do?

@nikomatsakis

nikomatsakis commented Jan 18, 2018

Copy link
Copy Markdown
Contributor

@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.

@mark-i-m
Change the --unpretty flag to -Z unpretty
ebfa6c7
-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).
@mark-i-m

mark-i-m commented Jan 19, 2018

Copy link
Copy Markdown
ContributorAuthor

@nikomatsakis Done :)

Thanks!

@nikomatsakis

nikomatsakis commented Jan 19, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 19, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit ebfa6c7 has been approved by nikomatsakis

@nikomatsakisnikomatsakis 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 19, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Jan 23, 2018
@kennytm
Rollup merge ofrust-lang#47440- mark-i-m:zunpretty, r=nikomatsakis
150f2ba
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).
Fixrust-lang#47395
r? @nikomatsakis EDIT: apparently rust-highfive doesn't see edits...
@kennytmkennytm mentioned this pull request Jan 23, 2018
Merged
bors added a commit that referenced this pull request Jan 23, 2018
@bors
Auto merge of#47678- kennytm:rollup, r=kennytm
4e3901d
Rollup of 14 pull requests
- Successful merges: #47423, #47425, #47440, #47541, #47549, #47554, #47558, #47610, #47635, #47655, #47661, #47662, #47667, #47672
- Failed merges:
@bors
bors merged commit ebfa6c7 into rust-lang:masterJan 23, 2018
@denzpdenzp mentioned this pull request Apr 24, 2018
Closed
@denzpdenzp mentioned this pull request Apr 25, 2018
Merged
@mark-i-m
mark-i-m deleted the zunpretty branch November 14, 2018 16:40
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis left review comments

Assignees

@nikomatsakisnikomatsakis

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@mark-i-m@rust-highfive@nikomatsakis@bors@kennytm@michaelwoerister