bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustdoc: use tuple indexing

Browse source
This commit is contained in:
Jorge Aparicio 2014-12-09 12:58:15 -05:00
parent 0c5d22c9cd
commit e792338318
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/html/format.rs
View file

@ -346,7 +346,7 @@ fn primitive_link(f: &mut fmt::Formatter,
Some(root) => { Some(root) => {
try!(write!(f, "<a href='{}{}/primitive.{}.html'>", try!(write!(f, "<a href='{}{}/primitive.{}.html'>",
root, root,
path.ref0().head().unwrap(), path.0.head().unwrap(),
prim.to_url_str())); prim.to_url_str()));
needs_termination = true; needs_termination = true;
} }

2
src/librustdoc/html/render.rs
View file

@ -323,7 +323,7 @@ pub fn run(mut krate: clean::Crate,
}).unwrap_or(HashMap::new()); }).unwrap_or(HashMap::new());
let mut cache = Cache { let mut cache = Cache {
impls: HashMap::new(), impls: HashMap::new(),
external_paths: paths.iter().map(|(&k, v)| (k, v.ref0().clone())) external_paths: paths.iter().map(|(&k, v)| (k, v.0.clone()))
.collect(), .collect(),
paths: paths, paths: paths,
implementors: HashMap::new(), implementors: HashMap::new(),

2
src/librustdoc/lib.rs
View file

@ -400,7 +400,7 @@ fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matche
.position(|&(p, _, _)| { .position(|&(p, _, _)| {
p == *pass p == *pass
}) { }) {
Some(i) => PASSES[i].val1(), Some(i) => PASSES[i].1,
None => { None => {
error!("unknown pass {}, skipping", *pass); error!("unknown pass {}, skipping", *pass);
continue continue

8
src/librustdoc/stability_summary.rs
View file

@ -151,14 +151,14 @@ fn summarize_item(item: &Item) -> (Counts, Option<ModuleSummary>) {
ImplItem(Impl { items: ref subitems, trait_: None, .. }) => { ImplItem(Impl { items: ref subitems, trait_: None, .. }) => {
let subcounts = subitems.iter().filter(|i| visible(*i)) let subcounts = subitems.iter().filter(|i| visible(*i))
.map(summarize_item) .map(summarize_item)
.map(|s| s.val0()) .map(|s| s.0)
.fold(Counts::zero(), |acc, x| acc + x); .fold(Counts::zero(), |acc, x| acc + x);
(subcounts, None) (subcounts, None)
} }
// `pub` automatically // `pub` automatically
EnumItem(Enum { variants: ref subitems, .. }) => { EnumItem(Enum { variants: ref subitems, .. }) => {
let subcounts = subitems.iter().map(summarize_item) let subcounts = subitems.iter().map(summarize_item)
.map(|s| s.val0()) .map(|s| s.0)
.fold(Counts::zero(), |acc, x| acc + x); .fold(Counts::zero(), |acc, x| acc + x);
(item_counts + subcounts, None) (item_counts + subcounts, None)
} }
@ -176,7 +176,7 @@ fn summarize_item(item: &Item) -> (Counts, Option<ModuleSummary>) {
let subcounts = trait_items.iter() let subcounts = trait_items.iter()
.map(extract_item) .map(extract_item)
.map(summarize_item) .map(summarize_item)
.map(|s| s.val0()) .map(|s| s.0)
.fold(Counts::zero(), |acc, x| acc + x); .fold(Counts::zero(), |acc, x| acc + x);
(item_counts + subcounts, None) (item_counts + subcounts, None)
} }
@ -212,7 +212,7 @@ pub fn build(krate: &Crate) -> ModuleSummary {
submodules: Vec::new(), submodules: Vec::new(),
}, },
Some(ref item) => ModuleSummary { Some(ref item) => ModuleSummary {
name: krate.name.clone(), .. summarize_item(item).val1().unwrap() name: krate.name.clone(), .. summarize_item(item).1.unwrap()
} }
} }
} }