Skip to content

Commit 8d1035a

Browse files
committed
---
yaml --- r: 46389 b: refs/heads/auto c: 2ec958d h: refs/heads/master i: 46387: 6852f83 v: v3
1 parent c34205b commit 8d1035a

File tree

5 files changed

+10
-24
lines changed

5 files changed

+10
-24
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: f513c567cb5b02a514af3903941434efd0b8a5eb
17+
refs/heads/auto: 2ec958db5ae37f193d4d632635818241b134a617

branches/auto/src/librustc/middle/typeck/check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
11981198

11991199
tcx.sess.span_err(sp, msg);
12001200

1201-
vec::from_fn(supplied_arg_count, |_| ty::mk_err(tcx))
1201+
vec::from_fn(expected_arg_count, |_| ty::mk_err(tcx))
12021202
};
12031203

12041204
sig.output

branches/auto/src/test/bench/core-map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,26 +302,26 @@ fn main() {
302302
}
303303
};
304304

305-
let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
305+
let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
306306

307307
{
308-
let rng = rand::seeded_rng(&seed);
308+
let rng = rand::seeded_rng(seed);
309309
let mut results = empty_results();
310310
old_int_benchmarks(rng, num_keys, &mut results);
311311
old_str_benchmarks(rng, num_keys, &mut results);
312312
write_results("std::oldmap::HashMap", &results);
313313
}
314314

315315
{
316-
let rng = rand::seeded_rng(&seed);
316+
let rng = rand::seeded_rng(seed);
317317
let mut results = empty_results();
318318
linear_int_benchmarks(rng, num_keys, &mut results);
319319
linear_str_benchmarks(rng, num_keys, &mut results);
320320
write_results("core::hashmap::linear::LinearMap", &results);
321321
}
322322

323323
{
324-
let rng = rand::seeded_rng(&seed);
324+
let rng = rand::seeded_rng(seed);
325325
let mut results = empty_results();
326326
tree_int_benchmarks(rng, num_keys, &mut results);
327327
tree_str_benchmarks(rng, num_keys, &mut results);

branches/auto/src/test/bench/core-set.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,27 +152,27 @@ fn main() {
152152
}
153153
};
154154

155-
let seed = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
155+
let seed = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
156156
let max = 200000;
157157

158158
{
159-
let rng = rand::seeded_rng(&seed);
159+
let rng = rand::seeded_rng(seed);
160160
let mut results = empty_results();
161161
results.bench_int(rng, num_keys, max, || LinearSet::new::<uint>());
162162
results.bench_str(rng, num_keys, || LinearSet::new::<~str>());
163163
write_results("core::hashmap::LinearSet", &results);
164164
}
165165

166166
{
167-
let rng = rand::seeded_rng(&seed);
167+
let rng = rand::seeded_rng(seed);
168168
let mut results = empty_results();
169169
results.bench_int(rng, num_keys, max, || TreeSet::new::<uint>());
170170
results.bench_str(rng, num_keys, || TreeSet::new::<~str>());
171171
write_results("std::treemap::TreeSet", &results);
172172
}
173173

174174
{
175-
let rng = rand::seeded_rng(&seed);
175+
let rng = rand::seeded_rng(seed);
176176
let mut results = empty_results();
177177
results.bench_int(rng, num_keys, max, || BitvSet::new());
178178
write_results("std::bitv::BitvSet", &results);

branches/auto/src/test/compile-fail/issue-4935.rs

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)