bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: Remove non-procedure uses of do from librustc, librustdoc,

Browse source 
and librustpkg.
This commit is contained in:
Patrick Walton 2013-11-21 15:42:55 -08:00
parent efc512362b
commit 8ceb374ab7
78 changed files with 1311 additions and 1347 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -170,11 +170,11 @@ fn path(w: &mut io::Writer, path: &clean::Path, print_all: bool,
}
// Did someone say rightward-drift?
do local_data::get(current_location_key) |loc| {
local_data::get(current_location_key, |loc| {
let loc = loc.unwrap();
do local_data::get(cache_key) |cache| {
do cache.unwrap().read |cache| {
local_data::get(cache_key, |cache| {
cache.unwrap().read(|cache| {
let abs_root = root(cache, loc.as_slice());
let rel_root = match path.segments[0].name.as_slice() {
"self" => Some(~"./"),
@ -238,9 +238,9 @@ fn path(w: &mut io::Writer, path: &clean::Path, print_all: bool,
}
}
write!(w, "{}", generics);
}
}
}
})
})
})
}
/// Helper to render type parameters
@ -262,11 +262,11 @@ impl fmt::Default for clean::Type {
fn fmt(g: &clean::Type, f: &mut fmt::Formatter) {
match *g {
clean::TyParamBinder(id) | clean::Generic(id) => {
do local_data::get(cache_key) |cache| {
do cache.unwrap().read |m| {
local_data::get(cache_key, |cache| {
cache.unwrap().read(|m| {
f.buf.write(m.typarams.get(&id).as_bytes());
}
}
})
})
}
clean::ResolvedPath{id, typarams: ref tp, path: ref path} => {
resolved_path(f.buf, id, path, false);