rustc: rename multiple imports in a list #27451

seanmonstar · Aug 1, 2015

An implementation of RFC 1219.

The RFC is not merged yet, but once merged, this could be.

rust-highfive · Aug 1, 2015

r? @alexcrichton

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

alexcrichton · Aug 3, 2015

alexcrichton reviewed Aug 3, 2015

View changes

alexcrichton · Aug 3, 2015

src/librustdoc/clean/mod.rs

@@ -2430,11 +2430,11 @@ pub struct ViewListIdent {
 impl Clean<ViewListIdent> for ast::PathListItem {
    fn clean(&self, cx: &DocContext) -> ViewListIdent {
        match self.node {
-            ast::PathListIdent { id, name } => ViewListIdent {
+            ast::PathListIdent { id, name, .. } => ViewListIdent {


I think these cases need to be handled to show reexports correctly, this will probably need to update the ViewListIdent structures here, and can you be sure to add a rustdoc test for this?

OH, I misunderstood what this code did. Re-exports, of course.

alexcrichton · Aug 3, 2015

alexcrichton reviewed Aug 3, 2015

View changes

alexcrichton · Aug 3, 2015

src/libsyntax/ast.rs

@@ -1656,14 +1656,14 @@ pub type Variant = Spanned<Variant_>;

 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
 pub enum PathListItem_ {
-    PathListIdent { name: Ident, id: NodeId },
-    PathListMod { id: NodeId }
+    PathListIdent { name: Ident, rename: Option<Ident>, id: NodeId },


Can you add some comments explaining what this rename field is for?

alexcrichton · Aug 3, 2015

Can you be sure to add some more exhaustive tests for this? It looks like this only includes "this will parse" tests rather than "this will resolve" tests along with tests for things like error messages (e.g. an item doesn't exist in a module).

seanmonstar · Aug 3, 2015

Ah, you're right, that test doesn't test it resolved the correct item.

tests for things like error messages (e.g. an item doesn't exist in a module).

@alexcrichton I assumed those tests already exist as normal importing tests.

alexcrichton · Aug 3, 2015

They probably do exist, but new ones should be added for this new feature. This should be as exhaustively tested as possible, basically, because although the implementation may be simple today a later refactoring will benefit from an exhaustive set of tests.

seanmonstar · Aug 6, 2015

@alexcrichton i've fixed up rustdoc and some error tests. some other specific tests you have in mind? I

Manishearth · Aug 6, 2015

This needs a visit_ident() in libsyntax/visit.rs

Manishearth · Aug 6, 2015

parser-lalr.y probably needs changing to pass tests too

seanmonstar · Aug 7, 2015

@Manishearth a change in walk_item? I don't know the use of that function well; should you visit both the name and rename (if let Some(ident) = rename), or only name is rename is None?

In other words, use std::io::{Error as IoError, Read} would visit Error, IoError, and then Read?

Manishearth · Aug 7, 2015

Visit both. visit.rs is for AST visiting, so anything in the AST should get visited

seanmonstar · Aug 8, 2015

@Manishearth like so?

Manishearth · Aug 8, 2015

Yep!

alexcrichton · Aug 10, 2015

All looks good to me, thanks @seanmonstar!

@bors: r+ cfcd449

bors · Aug 10, 2015

⌛️ Testing commit cfcd449 with merge 8856927...

bors · Aug 10, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

rust-highfive assigned alexcrichton Aug 1, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch 6 times, most recently from 670aaf6 to e042365 Aug 3, 2015

Manishearth referenced this pull request Aug 7, 2015
Closed
Tracking issue for the `use_group_as` RFC #27578

seanmonstar force-pushed the seanmonstar:use-groups-as branch from e042365 to 47d963f Aug 8, 2015

rustc: rename multiple imports in a list

Loading status checks…

cfcd449

seanmonstar force-pushed the seanmonstar:use-groups-as branch from 47d963f to cfcd449 Aug 8, 2015

bors added a commit that referenced this pull request Aug 10, 2015

Auto merge of #27451 - seanmonstar:use-groups-as, r=alexcrichton
An implementation of [RFC 1219](rust-lang/rfcs#1219). The RFC is not merged yet, but once merged, this could be.

Loading status checks…

8856927

bors merged commit cfcd449 into rust-lang:master Aug 10, 2015
2 checks passed

2 checks passed

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

homu Test successful
Details

petrochenkov referenced this pull request Sep 14, 2015
Merged
Prohibit renaming to primitive types' names in import lists #28406

bors added a commit that referenced this pull request Sep 15, 2015

Auto merge of #28406 - petrochenkov:primitive, r=eddyb
This was missing from #27451 r? @eddyb

Loading status checks…

7161530

bluss added the relnotes label Sep 15, 2015

matklad referenced this pull request Oct 29, 2015
Closed
Provide tests for Rust 1.4 #2

rust-lang/rust

Join GitHub today

rustc: rename multiple imports in a list #27451

Conversation

seanmonstar commented Aug 1, 2015

rust-highfive assigned alexcrichton Aug 1, 2015

This comment has been minimized.

rust-highfive commented Aug 1, 2015

alexcrichton reviewed Aug 3, 2015 View changes

This comment has been minimized.

alexcrichton Aug 3, 2015

This comment has been minimized.

seanmonstar Aug 3, 2015

alexcrichton reviewed Aug 3, 2015 View changes

This comment has been minimized.

alexcrichton Aug 3, 2015

This comment has been minimized.

alexcrichton commented Aug 3, 2015

This comment has been minimized.

seanmonstar commented Aug 3, 2015

This comment has been minimized.

alexcrichton commented Aug 3, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch 6 times, most recently from 670aaf6 to e042365 Aug 3, 2015

This comment has been minimized.

seanmonstar commented Aug 6, 2015

This comment has been minimized.

Manishearth commented Aug 6, 2015

This comment has been minimized.

Manishearth commented Aug 6, 2015

Manishearth referenced this pull request Aug 7, 2015

Tracking issue for the `use_group_as` RFC #27578

This comment has been minimized.

seanmonstar commented Aug 7, 2015

This comment has been minimized.

Manishearth commented Aug 7, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch from e042365 to 47d963f Aug 8, 2015

This comment has been minimized.

seanmonstar commented Aug 8, 2015

This comment has been minimized.

Manishearth commented Aug 8, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch from 47d963f to cfcd449 Aug 8, 2015

This comment has been minimized.

alexcrichton commented Aug 10, 2015

bors added a commit that referenced this pull request Aug 10, 2015

This comment has been minimized.

bors commented Aug 10, 2015

This comment has been minimized.

bors commented Aug 10, 2015

Hide details View details bors merged commit cfcd449 into rust-lang:master Aug 10, 2015 2 checks passed

2 checks passed

petrochenkov referenced this pull request Sep 14, 2015

Prohibit renaming to primitive types' names in import lists #28406

bors added a commit that referenced this pull request Sep 15, 2015

bluss added the relnotes label Sep 15, 2015

matklad referenced this pull request Oct 29, 2015

Provide tests for Rust 1.4 #2

alexcrichton reviewed Aug 3, 2015

View changes

alexcrichton reviewed Aug 3, 2015

View changes

seanmonstar force-pushed the seanmonstar:use-groups-as branch 6 times, most recently from `670aaf6` to `e042365` Aug 3, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch from `e042365` to `47d963f` Aug 8, 2015

seanmonstar force-pushed the seanmonstar:use-groups-as branch from `47d963f` to `cfcd449` Aug 8, 2015

bors merged commit `cfcd449` into rust-lang:master Aug 10, 2015
2 checks passed