Skip to content

Commit 6c7a2ff

Browse files
committed
Rust upgrade to rustc 1.9.0-nightly (74b886a 2016-03-13), update compiletest
1 parent 4fa6f49 commit 6c7a2ff

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ sudo: false
55
script:
66
- python util/update_lints.py -c
77
- cargo build --features debugging
8+
- rm -rf target/ Cargo.lock
89
- cargo test --features debugging
910

1011
# only test regex_macros if it compiles

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "clippy"
3-
version = "0.0.51"
3+
version = "0.0.52"
44
authors = [
55
"Manish Goregaokar <[email protected]>",
66
"Andre Bogus <[email protected]>",
@@ -18,16 +18,16 @@ name = "clippy"
1818
plugin = true
1919

2020
[dependencies]
21-
regex-syntax = "0.2.2"
21+
regex-syntax = "0.3.0"
2222
regex_macros = { version = "0.1.28", optional = true }
2323
semver = "0.2.1"
2424
toml = "0.1"
2525
unicode-normalization = "0.1"
2626

2727
[dev-dependencies]
28-
compiletest_rs = "0.0.11"
28+
compiletest_rs = "0.1.0"
2929
lazy_static = "0.1.15"
30-
regex = "0.1.47"
30+
regex = "0.1.56"
3131
rustc-serialize = "0.3"
3232

3333
[features]

tests/dogfood.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
#![feature(test)]
2+
13
extern crate compiletest_rs as compiletest;
4+
extern crate test;
25

3-
use std::path::Path;
46
use std::env::var;
7+
use std::path::PathBuf;
8+
use test::TestPaths;
59

610
#[test]
711
fn dogfood() {
@@ -20,5 +24,10 @@ fn dogfood() {
2024

2125
config.mode = cfg_mode;
2226

23-
compiletest::runtest::run(config, &Path::new("src/lib.rs"));
27+
let paths = TestPaths {
28+
base: PathBuf::new(),
29+
file: PathBuf::from("src/lib.rs"),
30+
relative_dir: PathBuf::new(),
31+
};
32+
compiletest::runtest::run(config, &paths);
2433
}

0 commit comments

Comments
 (0)