diff options
| author | bors <bors@rust-lang.org> | 2015-02-05 15:22:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-05 15:22:48 +0000 |
| commit | 2c05354211b04a52cc66a0b8ad8b2225eaf9e972 (patch) | |
| tree | d9e86702774074efe4d9f44aba0fad8355e1655e /src/compiletest/compiletest.rs | |
| parent | 2bd8ec2d197809fc0f0efccf1de14419ffb17b2b (diff) | |
| parent | 92f11e938a80a719badcd2168a2e38a2a800fcb6 (diff) | |
| download | rust-2c05354211b04a52cc66a0b8ad8b2225eaf9e972.tar.gz rust-2c05354211b04a52cc66a0b8ad8b2225eaf9e972.zip | |
Auto merge of #21843 - japaric:kindless, r=alexcrichton
This needs a snapshot that includes #21805 before it can be merged. There are some places where type inference regressed after I removed the annotations (see `FIXME`s). cc @nikomatsakis. r? @eddyb or anyone (I'll remove the `FIXME`s before merging, as they are only intended to point out regressions)
Diffstat (limited to 'src/compiletest/compiletest.rs')
| -rw-r--r-- | src/compiletest/compiletest.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 07e92c704d8..a5512b30424 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -359,7 +359,7 @@ pub fn make_metrics_test_closure(config: &Config, testfile: &Path) -> test::Test let config = (*config).clone(); // FIXME (#9639): This needs to handle non-utf8 paths let testfile = testfile.as_str().unwrap().to_string(); - test::DynMetricFn(box move |: mm: &mut test::MetricMap| { + test::DynMetricFn(box move |mm: &mut test::MetricMap| { runtest::run_metrics(config, testfile, mm) }) } |