Skip to content

Commit 6fcf2ee

Browse files
erickterickt
committed
std: Transform.find_ -> .find
1 parent f9dee04 commit 6fcf2ee

File tree

21 files changed

+33
-33
lines changed

21 files changed

+33
-33
lines changed

‎src/librust/rust.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn rustc_help() {
128128
}
129129

130130
fn find_cmd(command_string: &str) -> Option<Command> {
131-
do COMMANDS.iter().find_ |command| {
131+
do COMMANDS.iter().find |command| {
132132
command.cmd == command_string
133133
}.map_move(|x| *x)
134134
}

‎src/librustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ pub fn build_output_filenames(input: &input,
946946
let linkage_metas = attr::find_linkage_metas(attrs);
947947
if !linkage_metas.is_empty() {
948948
// But if a linkage meta is present, that overrides
949-
let maybe_name = linkage_metas.iter().find_(|m| "name" == m.name());
949+
let maybe_name = linkage_metas.iter().find(|m| "name" == m.name());
950950
match maybe_name.chain(|m| m.value_str()) {
951951
Some(s) => stem = s,
952952
_ => ()

‎src/librustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fn visit_item(e: &Env, i: @ast::item) {
183183
match fm.sort {
184184
ast::named => {
185185
let link_name = i.attrs.iter()
186-
.find_(|at| "link_name" == at.name())
186+
.find(|at| "link_name" == at.name())
187187
.chain(|at| at.value_str());
188188

189189
let foreign_name = match link_name {

‎src/librustc/middle/check_match.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub fn check_exhaustive(cx: &MatchCheckCtxt, sp: span, pats: ~[@pat]) {
169169
};
170170
let variants = ty::enum_variants(cx.tcx, id);
171171

172-
match variants.iter().find_(|v| v.id == vid) {
172+
match variants.iter().find(|v| v.id == vid) {
173173
Some(v) => Some(cx.tcx.sess.str_of(v.name)),
174174
None => {
175175
fail!("check_exhaustive: bad variant in ctor")
@@ -222,7 +222,7 @@ pub enum ctor {
222222
pub fn is_useful(cx: &MatchCheckCtxt, m: &matrix, v: &[@pat]) -> useful {
223223
if m.len() == 0u { return useful_; }
224224
if m[0].len() == 0u { return not_useful; }
225-
let real_pat = match m.iter().find_(|r| r[0].id != 0) {
225+
let real_pat = match m.iter().find(|r| r[0].id != 0) {
226226
Some(r) => r[0], None => v[0]
227227
};
228228
let left_ty = if real_pat.id == 0 { ty::mk_nil() }
@@ -470,7 +470,7 @@ pub fn ctor_arity(cx: &MatchCheckCtxt, ctor: &ctor, ty: ty::t) -> uint {
470470
ty::ty_enum(eid, _) => {
471471
let id = match *ctor { variant(id) => id,
472472
_ => fail!("impossible case") };
473-
match ty::enum_variants(cx.tcx, eid).iter().find_(|v| v.id == id ) {
473+
match ty::enum_variants(cx.tcx, eid).iter().find(|v| v.id == id ) {
474474
Some(v) => v.args.len(),
475475
None => fail!("impossible case")
476476
}
@@ -627,7 +627,7 @@ pub fn specialize(cx: &MatchCheckCtxt,
627627
if variant(variant_id) == *ctor_id {
628628
// FIXME #4731: Is this right? --pcw
629629
let args = flds.map(|ty_field| {
630-
match flds.iter().find_(|f|
630+
match flds.iter().find(|f|
631631
f.ident == ty_field.ident) {
632632
Some(f) => f.pat,
633633
_ => wild()
@@ -658,7 +658,7 @@ pub fn specialize(cx: &MatchCheckCtxt,
658658
}
659659
}
660660
let args = class_fields.iter().map(|class_field| {
661-
match flds.iter().find_(|f|
661+
match flds.iter().find(|f|
662662
f.ident == class_field.ident) {
663663
Some(f) => f.pat,
664664
_ => wild()

‎src/librustc/middle/trans/_match.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ fn enter_opt<'r>(bcx: @mut Block,
588588
let mut reordered_patterns = ~[];
589589
let r = ty::lookup_struct_fields(tcx, struct_id);
590590
for field in r.iter() {
591-
match field_pats.iter().find_(|p| p.ident == field.ident) {
591+
match field_pats.iter().find(|p| p.ident == field.ident) {
592592
None => reordered_patterns.push(dummy),
593593
Some(fp) => reordered_patterns.push(fp.pat)
594594
}
@@ -648,7 +648,7 @@ fn enter_rec_or_struct<'r>(bcx: @mut Block,
648648
ast::pat_struct(_, ref fpats, _) => {
649649
let mut pats = ~[];
650650
for fname in fields.iter() {
651-
match fpats.iter().find_(|p| p.ident == *fname) {
651+
match fpats.iter().find(|p| p.ident == *fname) {
652652
None => pats.push(dummy),
653653
Some(pat) => pats.push(pat.pat)
654654
}

‎src/librustc/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ pub fn cleanup_and_leave(bcx: @mut Block,
12771277
let mut skip = 0;
12781278
let mut dest = None;
12791279
{
1280-
let r = (*inf).cleanup_paths.rev_iter().find_(|cp| cp.target == leave);
1280+
let r = (*inf).cleanup_paths.rev_iter().find(|cp| cp.target == leave);
12811281
for cp in r.iter() {
12821282
if cp.size == inf.cleanups.len() {
12831283
Br(bcx, cp.dest);

‎src/librustc/middle/trans/consts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ fn const_expr_unadjusted(cx: @mut CrateContext, e: &ast::expr) -> ValueRef {
500500
|discr, field_tys| {
501501
let cs: ~[ValueRef] = field_tys.iter().enumerate()
502502
.map(|(ix, &field_ty)| {
503-
match fs.iter().find_(|f| field_ty.ident == f.ident) {
503+
match fs.iter().find(|f| field_ty.ident == f.ident) {
504504
Some(f) => const_expr(cx, (*f).expr),
505505
None => {
506506
match base_val {

‎src/librustc/middle/trans/meth.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ pub fn method_with_name(ccx: &mut CrateContext,
288288

289289
let imp = ccx.tcx.impls.find(&impl_id)
290290
.expect("could not find impl while translating");
291-
let meth = imp.methods.iter().find_(|m| m.ident == name)
291+
let meth = imp.methods.iter().find(|m| m.ident == name)
292292
.expect("could not find method while translating");
293293

294294
ccx.impl_method_cache.insert((impl_id, name), meth.def_id);

‎src/librustc/middle/trans/monomorphize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ pub fn monomorphic_fn(ccx: @mut CrateContext,
245245
}
246246
ast_map::node_variant(ref v, enum_item, _) => {
247247
let tvs = ty::enum_variants(ccx.tcx, local_def(enum_item.id));
248-
let this_tv = *tvs.iter().find_(|tv| { tv.id.node == fn_id.node}).unwrap();
248+
let this_tv = *tvs.iter().find(|tv| { tv.id.node == fn_id.node}).unwrap();
249249
let d = mk_lldecl();
250250
set_inline_hint(d);
251251
match v.node.kind {

‎src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4117,7 +4117,7 @@ pub fn lookup_struct_field(cx: ctxt,
41174117
field_id: ast::def_id)
41184118
-> field_ty {
41194119
let r = lookup_struct_fields(cx, parent);
4120-
match r.iter().find_(
4120+
match r.iter().find(
41214121
|f| f.id.node == field_id.node) {
41224122
Some(t) => *t,
41234123
None => cx.sess.bug("struct ID not found in parent's fields")

‎src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ pub fn lookup_field_ty(tcx: ty::ctxt,
11221122
fieldname: ast::ident,
11231123
substs: &ty::substs) -> Option<ty::t> {
11241124

1125-
let o_field = items.iter().find_(|f| f.ident == fieldname);
1125+
let o_field = items.iter().find(|f| f.ident == fieldname);
11261126
do o_field.map() |f| {
11271127
ty::lookup_field_type(tcx, class_id, f.id, substs)
11281128
}

‎src/librustc/middle/typeck/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ pub fn check_methods_against_trait(ccx: &CrateCtxt,
675675
// we'll catch it in coherence
676676
let trait_ms = ty::trait_methods(tcx, trait_ref.def_id);
677677
for impl_m in impl_ms.iter() {
678-
match trait_ms.iter().find_(|trait_m| trait_m.ident == impl_m.mty.ident) {
678+
match trait_ms.iter().find(|trait_m| trait_m.ident == impl_m.mty.ident) {
679679
Some(trait_m) => {
680680
let num_impl_tps = generics.ty_params.len();
681681
compare_impl_method(

‎src/librustdoc/attr_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn fold_enum(
133133
node: ast::item_enum(ref enum_definition, _), _
134134
}, _) => {
135135
let ast_variant =
136-
(*enum_definition.variants.iter().find_(|v| {
136+
(*enum_definition.variants.iter().find(|v| {
137137
to_str(v.node.name) == variant.name
138138
}).unwrap()).clone();
139139

‎src/librustdoc/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn maybe_find_pandoc(
221221
}
222222
};
223223

224-
let pandoc = do possible_pandocs.iter().find_ |&pandoc| {
224+
let pandoc = do possible_pandocs.iter().find |&pandoc| {
225225
let output = process_output(*pandoc, [~"--version"]);
226226
debug!("testing pandoc cmd %s: %?", *pandoc, output);
227227
output.status == 0

‎src/librustdoc/prune_private_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn strip_priv_methods(
8181
item_vis: ast::visibility
8282
) -> doc::ImplDoc {
8383
let methods = do doc.methods.iter().filter |method| {
84-
let ast_method = do methods.iter().find_ |m| {
84+
let ast_method = do methods.iter().find |m| {
8585
extract::to_str(m.ident) == method.name
8686
};
8787
assert!(ast_method.is_some());

‎src/librustdoc/tystr_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ fn fold_enum(
133133
node: ast::item_enum(ref enum_definition, _), _
134134
}, _) => {
135135
let ast_variant =
136-
(*do enum_definition.variants.iter().find_ |v| {
136+
(*do enum_definition.variants.iter().find |v| {
137137
to_str(v.node.name) == variant.name
138138
}.unwrap()).clone();
139139

@@ -187,7 +187,7 @@ fn get_method_sig(
187187
ast_map::node_item(@ast::item {
188188
node: ast::item_trait(_, _, ref methods), _
189189
}, _) => {
190-
match methods.iter().find_(|&method| {
190+
match methods.iter().find(|&method| {
191191
match (*method).clone() {
192192
ast::required(ty_m) => to_str(ty_m.ident) == method_name,
193193
ast::provided(m) => to_str(m.ident) == method_name,
@@ -223,7 +223,7 @@ fn get_method_sig(
223223
ast_map::node_item(@ast::item {
224224
node: ast::item_impl(_, _, _, ref methods), _
225225
}, _) => {
226-
match methods.iter().find_(|method| {
226+
match methods.iter().find(|method| {
227227
to_str(method.ident) == method_name
228228
}) {
229229
Some(method) => {

‎src/librusti/rusti.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ fn compile_crate(src_filename: ~str, binary: ~str) -> Option<bool> {
315315
// file, skip compilation and return None.
316316
let mut should_compile = true;
317317
let dir = os::list_dir_path(&Path(outputs.out_filename.dirname()));
318-
let maybe_lib_path = do dir.iter().find_ |file| {
318+
let maybe_lib_path = do dir.iter().find |file| {
319319
// The actual file's name has a hash value and version
320320
// number in it which is unknown at this time, so looking
321321
// for a file that matches out_filename won't work,

‎src/librustpkg/package_source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl PkgSrc {
5555
let dir;
5656
let dirs = pkgid_src_in_workspace(&self.id, &self.root);
5757
debug!("Checking dirs: %?", dirs);
58-
let path = dirs.iter().find_(|&d| os::path_exists(d));
58+
let path = dirs.iter().find(|&d| os::path_exists(d));
5959
match path {
6060
Some(d) => dir = (*d).clone(),
6161
None => dir = match self.fetch_git() {

‎src/libstd/iterator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ pub trait Iterator<A> {
458458

459459
/// Return the first element satisfying the specified predicate
460460
#[inline]
461-
fn find_(&mut self, predicate: &fn(&A) -> bool) -> Option<A> {
461+
fn find(&mut self, predicate: &fn(&A) -> bool) -> Option<A> {
462462
for x in *self {
463463
if predicate(&x) { return Some(x) }
464464
}
@@ -1819,9 +1819,9 @@ mod tests {
18191819
#[test]
18201820
fn test_find() {
18211821
let v: &[int] = &[1, 3, 9, 27, 103, 14, 11];
1822-
assert_eq!(*v.iter().find_(|x| *x & 1 == 0).unwrap(), 14);
1823-
assert_eq!(*v.iter().find_(|x| *x % 3 == 0).unwrap(), 3);
1824-
assert!(v.iter().find_(|x| *x % 12 == 0).is_none());
1822+
assert_eq!(*v.iter().find(|x| *x & 1 == 0).unwrap(), 14);
1823+
assert_eq!(*v.iter().find(|x| *x % 3 == 0).unwrap(), 3);
1824+
assert!(v.iter().find(|x| *x % 12 == 0).is_none());
18251825
}
18261826

18271827
#[test]

‎src/libstd/str.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub fn from_bytes(vv: &[u8]) -> ~str {
5959
use str::not_utf8::cond;
6060

6161
if !is_utf8(vv) {
62-
let first_bad_byte = *vv.iter().find_(|&b| !is_utf8([*b])).unwrap();
62+
let first_bad_byte = *vv.iter().find(|&b| !is_utf8([*b])).unwrap();
6363
cond.raise(fmt!("from_bytes: input is not UTF-8; first bad byte is %u",
6464
first_bad_byte as uint))
6565
} else {
@@ -76,7 +76,7 @@ pub fn from_bytes_owned(vv: ~[u8]) -> ~str {
7676
use str::not_utf8::cond;
7777

7878
if !is_utf8(vv) {
79-
let first_bad_byte = *vv.iter().find_(|&b| !is_utf8([*b])).unwrap();
79+
let first_bad_byte = *vv.iter().find(|&b| !is_utf8([*b])).unwrap();
8080
cond.raise(fmt!("from_bytes: input is not UTF-8; first bad byte is %u",
8181
first_bad_byte as uint))
8282
} else {

‎src/libsyntax/attr.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ pub fn contains_name<AM: AttrMetaMethods>(metas: &[AM], name: &str) -> bool {
186186
pub fn first_attr_value_str_by_name(attrs: &[Attribute], name: &str)
187187
-> Option<@str> {
188188
attrs.iter()
189-
.find_(|at| name == at.name())
189+
.find(|at| name == at.name())
190190
.chain(|at| at.value_str())
191191
}
192192

193193
pub fn last_meta_item_value_str_by_name(items: &[@MetaItem], name: &str)
194194
-> Option<@str> {
195-
items.rev_iter().find_(|mi| name == mi.name()).chain(|i| i.value_str())
195+
items.rev_iter().find(|mi| name == mi.name()).chain(|i| i.value_str())
196196
}
197197

198198
/* Higher-level applications */

0 commit comments

Comments
 (0)