rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #21340: pshc/libsyntax-no-more-ints

Browse Source 
Collaboration with @rylev!

I didn't change `int` in the [quasi-quoter](99ae1a30f3/src/libsyntax/ext/quote.rs (L328)), because I'm not sure if there will be adverse effects.

Addresses #21095.
This commit is contained in:
Alex Crichton
2015-01-21 09:13:51 -08:00
parent 5da25386b3 3c32cd1be2
commit 0c981875e4
46 changed files with 488 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsyntax/fold.rs
View File

@@ -174,8 +174,8 @@ pub trait Folder : Sized {
noop_fold_ident(i, self)
}
fn fold_uint(&mut self, i: uint) -> uint {
noop_fold_uint(i, self)
fn fold_usize(&mut self, i: usize) -> usize {
noop_fold_usize(i, self)
}
fn fold_path(&mut self, p: Path) -> Path {
@@ -505,7 +505,7 @@ pub fn noop_fold_ident<T: Folder>(i: Ident, _: &mut T) -> Ident {
i
}
pub fn noop_fold_uint<T: Folder>(i: uint, _: &mut T) -> uint {
pub fn noop_fold_usize<T: Folder>(i: usize, _: &mut T) -> usize {
i
}
@@ -1371,7 +1371,7 @@ pub fn noop_fold_expr<T: Folder>(Expr {id, node, span}: Expr, folder: &mut T) ->
}
ExprTupField(el, ident) => {
ExprTupField(folder.fold_expr(el),
respan(ident.span, folder.fold_uint(ident.node)))
respan(ident.span, folder.fold_usize(ident.node)))
}
ExprIndex(el, er) => {
ExprIndex(folder.fold_expr(el), folder.fold_expr(er))