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.

Sign up for GitHub

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

Jump to bottom

Implement import renaming with _ (RFC 2166) #48922

Merged
merged 1 commit into from
Mar 16, 2018
Merged

Implement import renaming with _ (RFC 2166) #48922

merged 1 commit into from
Mar 16, 2018

Conversation

petrochenkov
Copy link
Contributor

cc #48216

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 Mar 10, 2018
nikomatsakis
nikomatsakis approved these changes Mar 12, 2018
View reviewed changes
src/libsyntax/parse/parser.rs
@@ -7037,7 +7037,11 @@ impl<'a> Parser<'a> {

fn parse_rename(&mut self) -> PResult<'a, Option<Ident>> {
if self.eat_keyword(keywords::As) {
self.parse_ident().map(Some)
if self.eat(&token::Underscore) {
Ok(Some(Ident::with_empty_ctxt(Symbol::gensym("_"))))
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh man what a hack. But clever =)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit e351288 has been approved by nikomatsakis

@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 Mar 12, 2018
@nikomatsakis
Copy link
Contributor

@bors r-

@bors bors 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 Mar 13, 2018
@nikomatsakis
Copy link
Contributor

er, mistake, sorry

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 13, 2018

📌 Commit e351288 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 13, 2018
@kennytm
Copy link
Member

kennytm commented Mar 14, 2018

@bors r-

The UI tests in this PR will be broken by the rephrasing in #48684. Please rebase and update src/test/ui/feature-gate-underscore-imports.stderr. The last line should read

For more information about this error, try `rustc --explain E0658`.

@bors bors 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 Mar 14, 2018
@petrochenkov
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 14, 2018

📌 Commit 12ac032 has been approved by nikomatsakis

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 15, 2018
@kennytm
Rollup merge of rust-lang#48922 - petrochenkov:asunder, r=nikomatsakis
e1d19df 
Implement import renaming with `_` (RFC 2166)

cc rust-lang#48216
@kennytm kennytm mentioned this pull request Mar 15, 2018
Merged
bors added a commit that referenced this pull request Mar 16, 2018
@bors
Auto merge of #49051 - kennytm:rollup, r=kennytm
36b6687 
Rollup of 17 pull requests

- Successful merges: #48706, #48875, #48892, #48922, #48957, #48959, #48961, #48965, #49007, #49024, #49042, #49050, #48853, #48990, #49037, #49049, #48972
- Failed merges:
@bors bors merged commit 12ac032 into rust-lang:master Mar 16, 2018
This was referenced Oct 8, 2018
Closed
Merged
@petrochenkov petrochenkov mentioned this pull request Nov 28, 2018
Merged
@Centril Centril mentioned this pull request May 30, 2019
Merged
@petrochenkov petrochenkov deleted the asunder branch June 5, 2019 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: 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.
5 participants
@petrochenkov @rust-highfive @nikomatsakis @bors @kennytm