syntax: Make imports in AST closer to the source and cleanup their parsing by petrochenkov · Pull Request #48917 · rust-lang/rust

petrochenkov · 2018-03-10T17:05:56Z

This is a continuation of #45846 in some sense.

rust-highfive · 2018-03-10T17:06:06Z

(rust_highfive has picked a reviewer for you, use r? to override)

bors · 2018-03-11T07:09:30Z

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

michaelwoerister · 2018-03-12T13:37:35Z

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

oli-obk

r=me with some docs and a rebase

oli-obk · 2018-03-12T14:23:02Z

Can you add some docs?

petrochenkov · 2018-03-12T20:39:41Z

@bors r=oli-obk

bors · 2018-03-12T20:39:42Z

📌 Commit 6150b1b has been approved by oli-obk

bors · 2018-03-14T15:45:14Z

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

petrochenkov · 2018-03-15T00:29:39Z

@bors r=oli-obk

bors · 2018-03-15T00:29:39Z

📌 Commit 57ddaae has been approved by oli-obk

bors · 2018-03-17T17:20:12Z

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

bors · 2018-03-17T17:30:10Z

💔 Test failed - status-travis

Fix `unused_import_braces` lint false positive on `use prefix::{self as rename}`

…bilities Add the root segment for name resolution purposes only

Fix spans of root segments

petrochenkov · 2018-03-17T19:29:47Z

@bors r=oli-obk

bors · 2018-03-17T19:29:48Z

📌 Commit a02b1d7 has been approved by oli-obk

bors · 2018-03-18T01:50:58Z

⌛ Testing commit a02b1d7 with merge 5e3ecdc...

syntax: Make imports in AST closer to the source and cleanup their parsing This is a continuation of #45846 in some sense.

bors · 2018-03-18T04:34:44Z

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

kennytm-githubbot · 2018-03-18T04:36:04Z

📣 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).

@Manishearth

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

rust-highfive assigned michaelwoerister Mar 10, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2018

petrochenkov force-pushed the import branch from d9b3caa to bddeb15Compare March 10, 2018 19:14

oli-obk approved these changes Mar 12, 2018
View reviewed changes

Comment threadsrc/libsyntax/ast.rs Outdated
oli-obkMar 12, 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.
Can you add some docs?

oli-obk assigned oli-obk and unassigned michaelwoerister Mar 12, 2018

petrochenkov force-pushed the import branch from bddeb15 to 6150b1bCompare March 12, 2018 20:32

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 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 force-pushed the import branch from 6150b1b to 57ddaaeCompare March 15, 2018 00:29

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

petrochenkov added 3 commits March 17, 2018 22:12

AST/HIR: Clarify what the optional name in extern crate items mean
c6c6cf9

AST: Make renames in imports closer to the source
b057c55
Fix `unused_import_braces` lint false positive on `use prefix::{self as rename}`

AST: Keep distinction between path and ::path in imports and visi…
e5fb138
…bilities Add the root segment for name resolution purposes only

petrochenkov added 3 commits March 17, 2018 22:12

Rename Span::empty to Span::shrink_to_lo, add Span::shrink_to_hi
f881626

Cleanup import parsing
636357b
Fix spans of root segments

Add some docs + Fix rebase
a02b1d7

petrochenkov force-pushed the import branch from 57ddaae to a02b1d7Compare March 17, 2018 19:29

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 added a commit that referenced this pull request Mar 18, 2018
Auto merge of#48917- petrochenkov:import, r=oli-obk
5e3ecdc
syntax: Make imports in AST closer to the source and cleanup their parsing This is a continuation of #45846 in some sense.

bors merged commit a02b1d7 into rust-lang:masterMar 18, 2018

nrc mentioned this pull request Mar 18, 2018
Share use normalisation code between ordering and formatting rust-lang/rustfmt#2531
Closed

petrochenkov deleted the import branch June 5, 2019 16:01

Uh oh!

Uh oh!

Conversation

petrochenkov commented Mar 10, 2018• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Mar 10, 2018

Uh oh!

bors commented Mar 11, 2018

Uh oh!

michaelwoerister commented Mar 12, 2018

Uh oh!

oli-obk left a comment

Choose a reason for hiding this comment

Uh oh!

oli-obkMar 12, 2018

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Mar 12, 2018

Uh oh!

bors commented Mar 12, 2018

Uh oh!

bors commented Mar 14, 2018

Uh oh!

petrochenkov commented Mar 15, 2018

Uh oh!

bors commented Mar 15, 2018

Uh oh!

bors commented Mar 17, 2018

Uh oh!

bors commented Mar 17, 2018

Uh oh!

petrochenkov commented Mar 17, 2018

Uh oh!

bors commented Mar 17, 2018

Uh oh!

bors commented Mar 18, 2018

Uh oh!

bors commented Mar 18, 2018

Uh oh!

kennytm-githubbot commented Mar 18, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

petrochenkov commented Mar 10, 2018•
edited
Loading