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

petrochenkov · Mar 10, 2018

This is a continuation of #45846 in some sense.

rust-highfive · Mar 10, 2018

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

bors · Mar 11, 2018

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

michaelwoerister · Mar 12, 2018

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

oli-obk · Mar 12, 2018

oli-obk approved these changes Mar 12, 2018

View changes

r=me with some docs and a rebase

oli-obk · Mar 12, 2018

src/libsyntax/ast.rs

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

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


Can you add some docs?

petrochenkov · Mar 12, 2018

@bors r=oli-obk

bors · Mar 12, 2018

📌 Commit 6150b1b has been approved by oli-obk

bors · Mar 14, 2018

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

petrochenkov · Mar 15, 2018

@bors r=oli-obk

bors · Mar 15, 2018

📌 Commit 57ddaae has been approved by oli-obk

bors · Mar 17, 2018

⌛️ Testing commit 57ddaae with merge 79348e6...

bors · Mar 17, 2018

💔 Test failed - status-travis

petrochenkov · Mar 17, 2018

@bors r=oli-obk

bors · Mar 17, 2018

📌 Commit a02b1d7 has been approved by oli-obk

bors · Mar 18, 2018

⌛️ Testing commit a02b1d7 with merge 5e3ecdc...

bors · Mar 18, 2018

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

kennytm-githubbot · Mar 18, 2018

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

rust-highfive assigned michaelwoerister Mar 10, 2018

rust-highfive added the S-waiting-on-review label Mar 10, 2018

petrochenkov force-pushed the petrochenkov:import branch from d9b3caa to bddeb15 Mar 10, 2018

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

petrochenkov force-pushed the petrochenkov:import branch from bddeb15 to 6150b1b Mar 12, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review labels Mar 12, 2018

bors added S-waiting-on-author and removed S-waiting-on-bors labels Mar 14, 2018

petrochenkov force-pushed the petrochenkov:import branch from 6150b1b to 57ddaae Mar 15, 2018

bors added S-waiting-on-bors and removed S-waiting-on-author labels Mar 15, 2018

bors added a commit that referenced this pull request Mar 17, 2018

Auto merge of #48917 - petrochenkov:import, r=oli-obk
syntax: Make imports in AST closer to the source and cleanup their parsing This is a continuation of #45846 in some sense.

Loading status checks…

79348e6

bors added S-waiting-on-review and removed S-waiting-on-bors labels Mar 17, 2018

petrochenkov added some commits Mar 10, 2018

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

f881626

Cleanup import parsing
Fix spans of root segments

636357b

Add some docs + Fix rebase

Loading status checks…

a02b1d7

petrochenkov force-pushed the petrochenkov:import branch from 57ddaae to a02b1d7 Mar 17, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review 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
syntax: Make imports in AST closer to the source and cleanup their parsing This is a continuation of #45846 in some sense.

Loading status checks…

5e3ecdc

bors merged commit a02b1d7 into rust-lang:master Mar 18, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

nrc referenced this pull request Mar 18, 2018
Closed
Share `use` normalisation code between ordering and formatting #2531

rust-lang/rust

Join GitHub today

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

Conversation

petrochenkov commented Mar 10, 2018 • edited

rust-highfive assigned michaelwoerister Mar 10, 2018

This comment has been minimized.

rust-highfive commented Mar 10, 2018

rust-highfive added the S-waiting-on-review label Mar 10, 2018

petrochenkov force-pushed the petrochenkov:import branch from d9b3caa to bddeb15 Mar 10, 2018

This comment has been minimized.

bors commented Mar 11, 2018

This comment has been minimized.

michaelwoerister commented Mar 12, 2018

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

oli-obk left a comment

This comment has been minimized.

oli-obk Mar 12, 2018

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

petrochenkov force-pushed the petrochenkov:import branch from bddeb15 to 6150b1b Mar 12, 2018

This comment has been minimized.

petrochenkov commented Mar 12, 2018

This comment has been minimized.

bors commented Mar 12, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review labels Mar 12, 2018

This comment has been minimized.

bors commented Mar 14, 2018

bors added S-waiting-on-author and removed S-waiting-on-bors labels Mar 14, 2018

petrochenkov force-pushed the petrochenkov:import branch from 6150b1b to 57ddaae Mar 15, 2018

This comment has been minimized.

petrochenkov commented Mar 15, 2018

This comment has been minimized.

bors commented Mar 15, 2018

bors added S-waiting-on-bors and removed S-waiting-on-author labels Mar 15, 2018

This comment has been minimized.

bors commented Mar 17, 2018

bors added a commit that referenced this pull request Mar 17, 2018

This comment has been minimized.

bors commented Mar 17, 2018

bors added S-waiting-on-review and removed S-waiting-on-bors labels Mar 17, 2018

petrochenkov added some commits Mar 9, 2018

petrochenkov added some commits Mar 10, 2018

petrochenkov force-pushed the petrochenkov:import branch from 57ddaae to a02b1d7 Mar 17, 2018

This comment has been minimized.

petrochenkov commented Mar 17, 2018

This comment has been minimized.

bors commented Mar 17, 2018

bors added S-waiting-on-bors and removed S-waiting-on-review labels Mar 17, 2018

This comment has been minimized.

bors commented Mar 18, 2018

bors added a commit that referenced this pull request Mar 18, 2018

This comment has been minimized.

bors commented Mar 18, 2018

Hide details View details bors merged commit a02b1d7 into rust-lang:master Mar 18, 2018 2 checks passed

2 checks passed

This comment has been minimized.

kennytm-githubbot commented Mar 18, 2018

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 18, 2018

nrc referenced this pull request Mar 18, 2018

Share `use` normalisation code between ordering and formatting #2531

petrochenkov commented Mar 10, 2018 •

edited

petrochenkov force-pushed the petrochenkov:import branch from `d9b3caa` to `bddeb15` Mar 10, 2018

oli-obk approved these changes Mar 12, 2018

View changes

petrochenkov force-pushed the petrochenkov:import branch from `bddeb15` to `6150b1b` Mar 12, 2018

petrochenkov force-pushed the petrochenkov:import branch from `6150b1b` to `57ddaae` Mar 15, 2018

petrochenkov force-pushed the petrochenkov:import branch from `57ddaae` to `a02b1d7` Mar 17, 2018

bors merged commit `a02b1d7` into rust-lang:master Mar 18, 2018
2 checks passed