user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

librustc: Fix merge fallout.

Browse source
This commit is contained in:
Patrick Walton 2014-01-21 10:08:10 -08:00 • committed by Huon Wilson
parent 3c9e9d35ac
commit a4dd3fe2f2
18 changed files with 130 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustdoc/clean.rs
View file

@ -1039,8 +1039,13 @@ pub enum ViewItemInner {
impl Clean<ViewItemInner> for ast::ViewItem_ {
fn clean(&self) -> ViewItemInner {
match self {
&ast::ViewItemExternMod(ref i, ref p, ref id) =>
ExternMod(i.clean(), p.map(|(ref x, _)| x.to_owned()), *id),
&ast::ViewItemExternMod(ref i, ref p, ref id) => {
let string = match *p {
None => None,
Some((ref x, _)) => Some(x.get().to_owned()),
};
ExternMod(i.clean(), string, *id)
}
&ast::ViewItemUse(ref vp) => Import(vp.clean())
}
}