dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some test failures

This commit is contained in:
Félix Fischer 2019-03-26 13:57:03 -03:00
parent d020565ed2
commit 3cff06a0eb
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clippy_lints/src/ranges.rs
View File

@ -161,8 +161,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
.ctxt() .ctxt()
.outer() .outer()
.expn_info() .expn_info()
.map(|info| info.call_site) .map_or(expr.span, |info| info.call_site);
.unwrap_or(expr.span);
span_lint_and_then( span_lint_and_then(
cx, cx,
RANGE_PLUS_ONE, RANGE_PLUS_ONE,

8
tests/compile-test.rs
View File

@ -100,13 +100,13 @@ fn run_ui_toml_tests(config: &compiletest::Config, mut tests: Vec<TestDescAndFn>
.position(|test| test.desc.name.to_string() == test_name.to_string()) .position(|test| test.desc.name.to_string() == test_name.to_string())
.expect("The test should be in there"); .expect("The test should be in there");
let opts = libtest::TestOpts { let opts = libtest::TestOpts {
list: opts.list.clone(), list: opts.list,
filter: opts.filter.clone(), filter: opts.filter.clone(),
filter_exact: opts.filter_exact.clone(), filter_exact: opts.filter_exact,
exclude_should_panic: Default::default(), exclude_should_panic: Default::default(),
run_ignored: libtest::RunIgnored::No, run_ignored: libtest::RunIgnored::No,
run_tests: opts.run_tests.clone(), run_tests: opts.run_tests,
bench_benchmarks: opts.bench_benchmarks.clone(), bench_benchmarks: opts.bench_benchmarks,
logfile: opts.logfile.clone(), logfile: opts.logfile.clone(),
nocapture: opts.nocapture, nocapture: opts.nocapture,
color: libtest::ColorConfig::AutoColor, color: libtest::ColorConfig::AutoColor,