dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the self handling from directly inside the loop

This commit is contained in:
DJMcNab 2018-12-21 23:01:16 +00:00
parent d8d60215da
commit bb1ee2f13a
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/ra_hir/src/path.rs
View File

@ -86,25 +86,22 @@ fn expand_use_tree(
},
};
for child_tree in use_tree_list.use_trees() {
// Handle self in a path.
// E.g. `use something::{self, <...>}`
if let Some(path) = child_tree.path() {
if path.qualifier().is_none() {
if let Some(segment) = path.segment() {
if segment.kind() == Some(ast::PathSegmentKind::SelfKw) {
/* TODO: Work out what on earth range means in this callback */
if let Some(prefix) = prefix.clone() {
cb(prefix, Some(segment.syntax().range()));
continue;
}
}
}
}
}
expand_use_tree(prefix.clone(), child_tree, cb);
}
} else {
if let Some(ast_path) = tree.path() {
// Handle self in a path.
// E.g. `use something::{self, <...>}`
if ast_path.qualifier().is_none() {
if let Some(segment) = ast_path.segment() {
if segment.kind() == Some(ast::PathSegmentKind::SelfKw) {
if let Some(prefix) = prefix {
cb(prefix, Some(segment.syntax().range()));
return;
}
}
}
}
if let Some(path) = convert_path(prefix, ast_path) {
let range = if tree.has_star() {
None
@ -114,6 +111,8 @@ fn expand_use_tree(
};
cb(path, range)
}
// TODO: report errors somewhere
// We get here if we do
}
}
}