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

syntax: Make imports in AST closer to the source and cleanup their parsing #48917

Merged
merged 6 commits into from
Mar 18, 2018

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Mar 10, 2018

This is a continuation of #45846 in some sense.

@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(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
@bors
Copy link
Contributor

bors commented Mar 11, 2018

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

@michaelwoerister
Copy link
Member

Could someone else from @rust-lang/compiler take this over? This touches a lot of code that I know little about.

Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

r=me with some docs and a rebase

@@ -1880,18 +1880,29 @@ pub type Variant = Spanned<Variant_>;

#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
pub enum UseTreeKind {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add some docs?

@petrochenkov
Copy link
Contributor Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 12, 2018

📌 Commit 6150b1b has been approved by oli-obk

@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
@bors
Copy link
Contributor

bors commented Mar 14, 2018

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

@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=oli-obk

@bors
Copy link
Contributor

bors commented Mar 15, 2018

📌 Commit 57ddaae has been approved by oli-obk

@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 15, 2018
@bors
Copy link
Contributor

bors commented Mar 17, 2018

⌛ Testing commit 57ddaae719544aac2384bce9ee8471bbe49ae124 with merge 79348e6ce42fda50f745553dba8babf5a92b83a9...

@bors
Copy link
Contributor

bors commented Mar 17, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2018
Fix `unused_import_braces` lint false positive on `use prefix::{self as rename}`
…bilities

Add the root segment for name resolution purposes only
@petrochenkov
Copy link
Contributor Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 17, 2018

📌 Commit a02b1d7 has been approved by oli-obk

@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 17, 2018
@bors
Copy link
Contributor

bors commented Mar 18, 2018

⌛ Testing commit a02b1d7 with merge 5e3ecdc...

bors added a commit that referenced this pull request Mar 18, 2018
syntax: Make imports in AST closer to the source and cleanup their parsing

This is a continuation of #45846 in some sense.
@bors
Copy link
Contributor

bors commented Mar 18, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 5e3ecdc to master...

@bors bors merged commit a02b1d7 into rust-lang:master Mar 18, 2018
@kennytm-githubbot
Copy link

📣 Toolstate changed by #48917!

Tested on commit 5e3ecdc.
Direct link to PR: #48917

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 18, 2018
Tested on commit rust-lang/rust@5e3ecdc.
Direct link to PR: <rust-lang/rust#48917>

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk).
@petrochenkov petrochenkov deleted the import branch June 5, 2019 16:01
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.

6 participants