mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librustc_trans: fix fallout

Browse Source
This commit is contained in:
Jorge Aparicio 2014-12-01 22:52:22 -05:00
parent 56ecb51ba6
commit 60b0dd533b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_driver/pretty.rs
View File

@ -78,7 +78,7 @@ pub fn parse_pretty(sess: &Session, name: &str) -> (PpMode, Option<UserIdentifie
or `expanded,identified`; got {}", name).as_slice());
}
};
let opt_second = opt_second.and_then::<UserIdentifiedItem>(from_str);
let opt_second = opt_second.and_then::<UserIdentifiedItem, _>(from_str);
(first, opt_second)
}
@ -313,14 +313,12 @@ pub enum UserIdentifiedItem {
impl FromStr for UserIdentifiedItem {
fn from_str(s: &str) -> Option<UserIdentifiedItem> {
let extract_path_parts = || {
from_str(s).map(ItemViaNode).or_else(|| {
let v : Vec<_> = s.split_str("::")
.map(|x|x.to_string())
.collect();
Some(ItemViaPath(v))
};
from_str(s).map(ItemViaNode).or_else(extract_path_parts)
})
}
}