rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Try to fix a build regression before it happens

Browse Source
This commit is contained in:
Nick Cameron
2018-04-09 21:07:49 +12:00
parent f14671131e
commit e784712f09
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/imports.rs
View File

@@ -309,19 +309,24 @@ impl UseTree {
} }
} }
let mut done = false;
if aliased_self { if aliased_self {
match self.path.last() { match self.path.last_mut() {
Some(UseSegment::Ident(_, ref mut old_rename)) => { Some(UseSegment::Ident(_, ref mut old_rename)) => {
assert!(old_rename.is_none()); assert!(old_rename.is_none());
if let UseSegment::Slf(Some(rename)) = last { if let UseSegment::Slf(Some(rename)) = last.clone() {
*old_rename = Some(rename); *old_rename = Some(rename);
return self; done = true;
} }
} }
_ => unreachable!(), _ => unreachable!(),
} }
} }
if done {
return self;
}
// Normalise foo::{bar} -> foo::bar // Normalise foo::{bar} -> foo::bar
if let UseSegment::List(ref list) = last { if let UseSegment::List(ref list) = last {
if list.len() == 1 { if list.len() == 1 {