bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #23741: alexcrichton/remove-int-uint

Browse source 
Conflicts:
	src/librustc/middle/ty.rs
	src/librustc_trans/trans/adt.rs
	src/librustc_typeck/check/mod.rs
	src/libserialize/json.rs
	src/test/run-pass/spawn-fn.rs
This commit is contained in:
Alex Crichton 2015-03-27 10:10:05 -07:00
commit 28a6b16130
1401 changed files with 5240 additions and 5393 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -498,7 +498,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::Result<String> {
try!(write!(&mut w, ","));
}
try!(write!(&mut w, r#"[{},"{}","{}",{}"#,
item.ty as uint, item.name, path,
item.ty as usize, item.name, path,
item.desc.to_json().to_string()));
match item.parent {
Some(nodeid) => {
@ -522,7 +522,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::Result<String> {
try!(write!(&mut w, ","));
}
try!(write!(&mut w, r#"[{},"{}"]"#,
short as uint, *fqp.last().unwrap()));
short as usize, *fqp.last().unwrap()));
}
try!(write!(&mut w, "]}};"));
@ -1567,7 +1567,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
let mut indices = (0..items.len()).filter(|i| {
!cx.ignore_private_item(&items[*i])
}).collect::<Vec<uint>>();
}).collect::<Vec<usize>>();
// the order of item types in the listing
fn reorder(ty: ItemType) -> u8 {
@ -1588,7 +1588,7 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
}
}
fn cmp(i1: &clean::Item, i2: &clean::Item, idx1: uint, idx2: uint) -> Ordering {
fn cmp(i1: &clean::Item, i2: &clean::Item, idx1: usize, idx2: usize) -> Ordering {
let ty1 = shortty(i1);
let ty2 = shortty(i2);
if ty1 == ty2 {