about summary refs log tree commit diff
path: root/src/libsyntax/ast_map
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-22 12:49:57 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-22 12:49:57 -0800
commit459f3b2cfa0e618d6e28ce564a363a9477567f71 (patch)
tree4d308abea1b026ac9db0e538f6d01170b173c89f /src/libsyntax/ast_map
parent6938d51122f37dd7ab213b88bc2d457c5a9da781 (diff)
parent22050e3ed44d9b4d79edced506b470a425e0d302 (diff)
downloadrust-459f3b2cfa0e618d6e28ce564a363a9477567f71.tar.gz
rust-459f3b2cfa0e618d6e28ce564a363a9477567f71.zip
rollup merge of #20056: MrFloya/iter_rename
Conflicts:
	src/libcollections/bit.rs
	src/libcore/str.rs
Diffstat (limited to 'src/libsyntax/ast_map')
-rw-r--r--src/libsyntax/ast_map/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast_map/mod.rs b/src/libsyntax/ast_map/mod.rs
index e3eeb453c26..9b42a8f7540 100644
--- a/src/libsyntax/ast_map/mod.rs
+++ b/src/libsyntax/ast_map/mod.rs
@@ -73,9 +73,9 @@ impl<'a> Iterator<PathElem> for LinkedPath<'a> {
     }
 }
 
-// HACK(eddyb) move this into libstd (value wrapper for slice::Items).
+// HACK(eddyb) move this into libstd (value wrapper for slice::Iter).
 #[deriving(Clone)]
-pub struct Values<'a, T:'a>(pub slice::Items<'a, T>);
+pub struct Values<'a, T:'a>(pub slice::Iter<'a, T>);
 
 impl<'a, T: Copy> Iterator<T> for Values<'a, T> {
     fn next(&mut self) -> Option<T> {