diff options
| author | bors <bors@rust-lang.org> | 2013-08-10 13:17:19 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-10 13:17:19 -0700 |
| commit | 8b9e1ce75a3e1416f2db80d30f65879fd902183f (patch) | |
| tree | 07b97a6ad0d382272a978018c71c5220cece8237 /src/libsyntax/ext/source_util.rs | |
| parent | 2ba36ec62934c8b877766a6283633b6407c8d357 (diff) | |
| parent | c8a93efdae48b88bf594480705a5c0aac39c75e1 (diff) | |
| download | rust-8b9e1ce75a3e1416f2db80d30f65879fd902183f.tar.gz rust-8b9e1ce75a3e1416f2db80d30f65879fd902183f.zip | |
auto merge of #8430 : erickt/rust/cleanup-iterators, r=erickt
This PR does a bunch of cleaning up of various APIs. The major one is that it merges `Iterator` and `IteratorUtil`, and renames functions like `transform` into `map`. I also merged `DoubleEndedIterator` and `DoubleEndedIteratorUtil`, as well as I renamed various .consume* functions to .move_iter(). This helps to implement part of #7887.
Diffstat (limited to 'src/libsyntax/ext/source_util.rs')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 71903b9aa02..031f0fb4199 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -105,7 +105,7 @@ pub fn expand_include_bin(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) let file = get_single_str_from_tts(cx, sp, tts, "include_bin!"); match io::read_whole_file(&res_rel_file(cx, sp, &Path(file))) { result::Ok(src) => { - let u8_exprs: ~[@ast::expr] = src.iter().transform(|char| cx.expr_u8(sp, *char)).collect(); + let u8_exprs: ~[@ast::expr] = src.iter().map(|char| cx.expr_u8(sp, *char)).collect(); base::MRExpr(cx.expr_vec(sp, u8_exprs)) } result::Err(ref e) => { |