From 97452c0ca16238a2de5503aca07db26ff9e8ba63 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 2 Aug 2012 15:42:56 -0700 Subject: Remove modes from map API and replace with regions. API is (for now) mostly by value, there are options to use it by reference if you like. Hash and equality functions must be pure and by reference (forward looking to the day when something like send_map becomes the standard map). --- src/libstd/test.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/libstd/test.rs') diff --git a/src/libstd/test.rs b/src/libstd/test.rs index 5d503e4c15f..8d2673df5c6 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -372,13 +372,12 @@ fn filter_tests(opts: test_opts, }; // Sort the tests alphabetically - filtered = - { - fn lteq(t1: test_desc, t2: test_desc) -> bool { - str::le(t1.name, t2.name) - } - sort::merge_sort(|x,y| lteq(x, y), filtered) - }; + filtered = { + pure fn lteq(t1: &test_desc, t2: &test_desc) -> bool { + str::le(&t1.name, &t2.name) + } + sort::merge_sort(lteq, filtered) + }; return filtered; } @@ -486,7 +485,7 @@ mod tests { let args = ~[~"progname", ~"filter"]; let opts = alt parse_opts(args) { either::left(o) { o } _ { fail ~"Malformed arg in first_free_arg_should_be_a_filter"; } }; - assert (str::eq(~"filter", option::get(opts.filter))); + assert ~"filter" == option::get(opts.filter); } #[test] -- cgit 1.4.1-3-g733a5