Skip to content

Commit 8748a69

Browse files
borsbors
committed
auto merge of #15808 : jakub-/rust/use-mod, r=alexcrichton
Implements RFC #168.
2 parents c4dd47d + 4b9bc2e commit 8748a69

File tree

17 files changed

+268
-80
lines changed

17 files changed

+268
-80
lines changed

‎src/librustc/middle/privacy.rs

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -901,21 +901,29 @@ impl<'a> Visitor<()> for PrivacyVisitor<'a> {
901901
ast::ViewItemUse(ref vpath) => {
902902
match vpath.node {
903903
ast::ViewPathSimple(..) | ast::ViewPathGlob(..) => {}
904-
ast::ViewPathList(_, ref list, _) => {
904+
ast::ViewPathList(ref prefix, ref list, _) => {
905905
for pid in list.iter() {
906-
debug!("privacy - list {}", pid.node.id);
907-
let seg = ast::PathSegment {
908-
identifier: pid.node.name,
909-
lifetimes: Vec::new(),
910-
types: OwnedSlice::empty(),
911-
};
912-
let segs = vec!(seg);
913-
let path = ast::Path {
914-
global: false,
915-
span: pid.span,
916-
segments: segs,
917-
};
918-
self.check_path(pid.span, pid.node.id, &path);
906+
match pid.node {
907+
ast::PathListIdent { id, name } => {
908+
debug!("privacy - ident item {}", id);
909+
let seg = ast::PathSegment {
910+
identifier: name,
911+
lifetimes: Vec::new(),
912+
types: OwnedSlice::empty(),
913+
};
914+
let segs = vec![seg];
915+
let path = ast::Path {
916+
global: false,
917+
span: pid.span,
918+
segments: segs,
919+
};
920+
self.check_path(pid.span, id, &path);
921+
}
922+
ast::PathListMod { id } => {
923+
debug!("privacy - mod item {}", id);
924+
self.check_path(pid.span, id, prefix);
925+
}
926+
}
919927
}
920928
}
921929
}

‎src/librustc/middle/resolve.rs

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,29 +1455,20 @@ impl<'a> Resolver<'a> {
14551455
// Extract and intern the module part of the path. For
14561456
// globs and lists, the path is found directly in the AST;
14571457
// for simple paths we have to munge the path a little.
1458-
1459-
let mut module_path = Vec::new();
1460-
match view_path.node {
1458+
let module_path = match view_path.node {
14611459
ViewPathSimple(_, ref full_path, _) => {
1462-
let path_len = full_path.segments.len();
1463-
assert!(path_len != 0);
1464-
1465-
for (i, segment) in full_path.segments
1466-
.iter()
1467-
.enumerate() {
1468-
if i != path_len - 1 {
1469-
module_path.push(segment.identifier)
1470-
}
1471-
}
1460+
full_path.segments
1461+
.as_slice().init()
1462+
.iter().map(|ident| ident.identifier)
1463+
.collect()
14721464
}
14731465

14741466
ViewPathGlob(ref module_ident_path, _) |
14751467
ViewPathList(ref module_ident_path, _, _) => {
1476-
for segment in module_ident_path.segments.iter() {
1477-
module_path.push(segment.identifier)
1478-
}
1468+
module_ident_path.segments
1469+
.iter().map(|ident| ident.identifier).collect()
14791470
}
1480-
}
1471+
};
14811472

14821473
// Build up the import directives.
14831474
let module_ = parent.module();
@@ -1486,6 +1477,11 @@ impl<'a> Resolver<'a> {
14861477
ViewPathSimple(binding, ref full_path, id) => {
14871478
let source_ident =
14881479
full_path.segments.last().unwrap().identifier;
1480+
if token::get_ident(source_ident).get() == "mod" {
1481+
self.resolve_error(view_path.span,
1482+
"`mod` imports are only allowed within a { } list");
1483+
}
1484+
14891485
let subclass = SingleImport(binding,
14901486
source_ident);
14911487
self.build_import_directive(&*module_,
@@ -1495,16 +1491,50 @@ impl<'a> Resolver<'a> {
14951491
id,
14961492
is_public);
14971493
}
1498-
ViewPathList(_, ref source_idents, _) => {
1499-
for source_ident in source_idents.iter() {
1500-
let name = source_ident.node.name;
1494+
ViewPathList(_, ref source_items, _) => {
1495+
// Make sure there's at most one `mod` import in the list.
1496+
let mod_spans = source_items.iter().filter_map(|item| match item.node {
1497+
PathListMod { .. } => Some(item.span),
1498+
_ => None
1499+
}).collect::<Vec<Span>>();
1500+
match mod_spans.as_slice() {
1501+
[first, second, ..other] => {
1502+
self.resolve_error(first,
1503+
"`mod` import can only appear once in the list");
1504+
self.session.span_note(second,
1505+
"another `mod` import appears here");
1506+
for &other_span in other.iter() {
1507+
self.session.span_note(other_span,
1508+
"another `mod` import appears here");
1509+
}
1510+
},
1511+
[_] | [] => ()
1512+
}
1513+
1514+
for source_item in source_items.iter() {
1515+
let (module_path, name) = match source_item.node {
1516+
PathListIdent { name, .. } =>
1517+
(module_path.clone(), name),
1518+
PathListMod { .. } => {
1519+
let name = match module_path.last() {
1520+
Some(ident) => ident.clone(),
1521+
None => {
1522+
self.resolve_error(source_item.span,
1523+
"`mod` import can only appear in an import list \
1524+
with a non-empty prefix");
1525+
continue;
1526+
}
1527+
};
1528+
let module_path = module_path.as_slice().init();
1529+
(Vec::from_slice(module_path), name)
1530+
}
1531+
};
15011532
self.build_import_directive(
15021533
&*module_,
1503-
module_path.clone(),
1534+
module_path,
15041535
SingleImport(name, name),
1505-
source_ident.span,
1506-
source_ident.node.id,
1507-
is_public);
1536+
source_item.span,
1537+
source_item.node.id(), is_public);
15081538
}
15091539
}
15101540
ViewPathGlob(_, id) => {
@@ -5492,7 +5522,7 @@ impl<'a> Resolver<'a> {
54925522
ViewPathSimple(_, _, id) => self.finalize_import(id, p.span),
54935523
ViewPathList(_, ref list, _) => {
54945524
for i in list.iter() {
5495-
self.finalize_import(i.node.id, i.span);
5525+
self.finalize_import(i.node.id(), i.span);
54965526
}
54975527
},
54985528
ViewPathGlob(_, id) => {

‎src/librustc/middle/save/mod.rs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,16 +1120,23 @@ impl<'l> Visitor<DxrVisitorEnv> for DxrVisitor<'l> {
11201120
}
11211121
ast::ViewPathList(ref path, ref list, _) => {
11221122
for plid in list.iter() {
1123-
match self.lookup_type_ref(plid.node.id) {
1124-
Some(id) => match self.lookup_def_kind(plid.node.id, plid.span) {
1125-
Some(kind) => self.fmt.ref_str(kind,
1126-
plid.span,
1127-
Some(plid.span),
1128-
id,
1129-
e.cur_scope),
1130-
None => (),
1123+
match plid.node {
1124+
ast::PathListIdent { id, .. } => {
1125+
match self.lookup_type_ref(id) {
1126+
Some(def_id) =>
1127+
match self.lookup_def_kind(id, plid.span) {
1128+
Some(kind) => {
1129+
self.fmt.ref_str(
1130+
kind, plid.span,
1131+
Some(plid.span),
1132+
def_id, e.cur_scope);
1133+
}
1134+
None => ()
1135+
},
1136+
None => ()
1137+
}
11311138
},
1132-
None => ()
1139+
ast::PathListMod { .. } => ()
11331140
}
11341141
}
11351142

‎src/librustdoc/clean/mod.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,13 +1779,13 @@ impl Clean<Vec<Item>> for ast::ViewItem {
17791779
// to keep any non-inlineable reexports so they can be
17801780
// listed in the documentation.
17811781
let remaining = list.iter().filter(|path| {
1782-
match inline::try_inline(path.node.id) {
1782+
match inline::try_inline(path.node.id()) {
17831783
Some(items) => {
17841784
ret.extend(items.move_iter()); false
17851785
}
17861786
None => true,
17871787
}
1788-
}).map(|a| a.clone()).collect::<Vec<ast::PathListIdent>>();
1788+
}).map(|a| a.clone()).collect::<Vec<ast::PathListItem>>();
17891789
if remaining.len() > 0 {
17901790
let path = ast::ViewPathList(a.clone(),
17911791
remaining,
@@ -1868,11 +1868,17 @@ pub struct ViewListIdent {
18681868
pub source: Option<ast::DefId>,
18691869
}
18701870

1871-
impl Clean<ViewListIdent> for ast::PathListIdent {
1871+
impl Clean<ViewListIdent> for ast::PathListItem {
18721872
fn clean(&self) -> ViewListIdent {
1873-
ViewListIdent {
1874-
name: self.node.name.clean(),
1875-
source: resolve_def(self.node.id),
1873+
match self.node {
1874+
ast::PathListIdent { id, name } => ViewListIdent {
1875+
name: name.clean(),
1876+
source: resolve_def(id)
1877+
},
1878+
ast::PathListMod { id } => ViewListIdent {
1879+
name: "mod".to_string(),
1880+
source: resolve_def(id)
1881+
}
18761882
}
18771883
}
18781884
}

‎src/librustdoc/visit_ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl<'a> RustdocVisitor<'a> {
187187
ast::ViewPathList(ref p, ref paths, ref b) => {
188188
let mut mine = Vec::new();
189189
for path in paths.iter() {
190-
if !self.resolve_id(path.node.id, false, om, please_inline) {
190+
if !self.resolve_id(path.node.id(), false, om, please_inline) {
191191
mine.push(path.clone());
192192
}
193193
}

‎src/libsyntax/ast.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,12 +1033,20 @@ pub struct Variant_ {
10331033
pub type Variant = Spanned<Variant_>;
10341034

10351035
#[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash, Show)]
1036-
pub struct PathListIdent_ {
1037-
pub name: Ident,
1038-
pub id: NodeId,
1036+
pub enum PathListItem_ {
1037+
PathListIdent { pub name: Ident, pub id: NodeId },
1038+
PathListMod { pub id: NodeId }
1039+
}
1040+
1041+
impl PathListItem_ {
1042+
pub fn id(&self) -> NodeId {
1043+
match *self {
1044+
PathListIdent { id, .. } | PathListMod { id } => id
1045+
}
1046+
}
10391047
}
10401048

1041-
pub type PathListIdent = Spanned<PathListIdent_>;
1049+
pub type PathListItem = Spanned<PathListItem_>;
10421050

10431051
pub type ViewPath = Spanned<ViewPath_>;
10441052

@@ -1056,7 +1064,7 @@ pub enum ViewPath_ {
10561064
ViewPathGlob(Path, NodeId),
10571065

10581066
/// `foo::bar::{a,b,c}`
1059-
ViewPathList(Path, Vec<PathListIdent> , NodeId)
1067+
ViewPathList(Path, Vec<PathListItem> , NodeId)
10601068
}
10611069

10621070
#[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash, Show)]

‎src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl<'a, O: IdVisitingOperation> Visitor<()> for IdVisitor<'a, O> {
405405
ViewPathList(_, ref paths, node_id) => {
406406
self.operation.visit_id(node_id);
407407
for path in paths.iter() {
408-
self.operation.visit_id(path.node.id)
408+
self.operation.visit_id(path.node.id())
409409
}
410410
}
411411
}

‎src/libsyntax/ext/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
10451045
fn view_use_list(&self, sp: Span, vis: ast::Visibility,
10461046
path: Vec<ast::Ident> , imports: &[ast::Ident]) -> ast::ViewItem {
10471047
let imports = imports.iter().map(|id| {
1048-
respan(sp, ast::PathListIdent_ { name: *id, id: ast::DUMMY_NODE_ID })
1048+
respan(sp, ast::PathListIdent { name: *id, id: ast::DUMMY_NODE_ID })
10491049
}).collect();
10501050

10511051
self.view_use(sp, vis,

‎src/libsyntax/fold.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ pub trait Folder {
5555
let id = self.new_id(node_id);
5656
ViewPathList(self.fold_path(path),
5757
path_list_idents.iter().map(|path_list_ident| {
58-
let id = self.new_id(path_list_ident.node
59-
.id);
6058
Spanned {
61-
node: PathListIdent_ {
62-
name: path_list_ident.node
63-
.name
64-
.clone(),
65-
id: id,
59+
node: match path_list_ident.node {
60+
PathListIdent { id, name } =>
61+
PathListIdent {
62+
id: self.new_id(id),
63+
name: name.clone()
64+
},
65+
PathListMod { id } =>
66+
PathListMod { id: self.new_id(id) }
6667
},
67-
span: self.new_span(
68-
path_list_ident.span)
68+
span: self.new_span(path_list_ident.span)
6969
}
7070
}).collect(),
7171
id)

‎src/libsyntax/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
html_root_url = "http://doc.rust-lang.org/master/")]
2525

2626
#![feature(macro_rules, globs, managed_boxes, default_type_params, phase)]
27-
#![feature(quote, unsafe_destructor)]
27+
#![feature(quote, struct_variant, unsafe_destructor)]
2828
#![allow(deprecated)]
2929

3030
extern crate fmt_macros;

‎src/libsyntax/parse/parser.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -537,12 +537,16 @@ impl<'a> Parser<'a> {
537537
}
538538
}
539539

540-
pub fn parse_path_list_ident(&mut self) -> ast::PathListIdent {
540+
pub fn parse_path_list_item(&mut self) -> ast::PathListItem {
541541
let lo = self.span.lo;
542-
let ident = self.parse_ident();
542+
let node = if self.eat_keyword(keywords::Mod) {
543+
ast::PathListMod { id: ast::DUMMY_NODE_ID }
544+
} else {
545+
let ident = self.parse_ident();
546+
ast::PathListIdent { name: ident, id: ast::DUMMY_NODE_ID }
547+
};
543548
let hi = self.last_span.hi;
544-
spanned(lo, hi, ast::PathListIdent_ { name: ident,
545-
id: ast::DUMMY_NODE_ID })
549+
spanned(lo, hi, node)
546550
}
547551

548552
/// Consume token 'tok' if it exists. Returns true if the given
@@ -5176,7 +5180,7 @@ impl<'a> Parser<'a> {
51765180
let idents = self.parse_unspanned_seq(
51775181
&token::LBRACE, &token::RBRACE,
51785182
seq_sep_trailing_allowed(token::COMMA),
5179-
|p| p.parse_path_list_ident());
5183+
|p| p.parse_path_list_item());
51805184
let path = ast::Path {
51815185
span: mk_sp(lo, self.span.hi),
51825186
global: false,
@@ -5232,7 +5236,7 @@ impl<'a> Parser<'a> {
52325236
&token::LBRACE,
52335237
&token::RBRACE,
52345238
seq_sep_trailing_allowed(token::COMMA),
5235-
|p| p.parse_path_list_ident()
5239+
|p| p.parse_path_list_item()
52365240
);
52375241
let path = ast::Path {
52385242
span: mk_sp(lo, self.span.hi),

‎src/libsyntax/print/pprust.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2182,7 +2182,14 @@ impl<'a> State<'a> {
21822182
try!(word(&mut self.s, "::{"));
21832183
}
21842184
try!(self.commasep(Inconsistent, idents.as_slice(), |s, w| {
2185-
s.print_ident(w.node.name)
2185+
match w.node {
2186+
ast::PathListIdent { name, .. } => {
2187+
s.print_ident(name)
2188+
},
2189+
ast::PathListMod { .. } => {
2190+
word(&mut s.s, "mod")
2191+
}
2192+
}
21862193
}));
21872194
word(&mut self.s, "}")
21882195
}

‎src/libsyntax/visit.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,12 @@ pub fn walk_view_item<E: Clone, V: Visitor<E>>(visitor: &mut V, vi: &ViewItem, e
186186
}
187187
ViewPathList(ref path, ref list, _) => {
188188
for id in list.iter() {
189-
visitor.visit_ident(id.span, id.node.name, env.clone())
189+
match id.node {
190+
PathListIdent { name, .. } => {
191+
visitor.visit_ident(id.span, name, env.clone());
192+
}
193+
PathListMod { .. } => ()
194+
}
190195
}
191196
walk_path(visitor, path, env.clone());
192197
}

0 commit comments

Comments
 (0)