Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.9.0-nightly (74b886ab1 2016-03-13) #32

Merged
merged 1 commit into from
Mar 15, 2016

Conversation

mcarton
Copy link
Contributor

@mcarton mcarton commented Mar 14, 2016

I copied back everything, so maybe too much? The broken stuff was just in src/procsrv.rs with std::dynamic_lib having been removed.

See https://travis-ci.org/Manishearth/rust-clippy/builds/115863948 for the error it caused.

@Manishearth
Copy link
Owner

Does this break clippy?

Perhaps we should add a travis test that clones clippy, uses a path override to this compiletest, and runs the tests.

(A submodule might not work since cargo clones through submodules, which leads to double clippy being downloaded)

@mcarton
Copy link
Contributor Author

mcarton commented Mar 14, 2016

Clippy currently cannot be tested on the last nightly. With that PR, it needs the following patch:

diff --git a/tests/dogfood.rs b/tests/dogfood.rs
index 61e37c2..b5ae813 100644
--- a/tests/dogfood.rs
+++ b/tests/dogfood.rs
@@ -1,7 +1,11 @@
+#![feature(test)]
+
 extern crate compiletest_rs as compiletest;
+extern crate test;

-use std::path::Path;
 use std::env::var;
+use std::path::PathBuf;
+use test::TestPaths;

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

     config.mode = cfg_mode;

-    compiletest::runtest::run(config, &Path::new("src/lib.rs"));
+    let paths = TestPaths {
+        base: PathBuf::new(),
+        file: PathBuf::from("src/lib.rs"),
+        relative_dir: PathBuf::new(),
+    };
+    compiletest::runtest::run(config, &paths);
 }

I did not realize this would break the API, is this a problem? If so, I can just revert everything and just fix the std::dynamic_lib stuff (but Rust’s compiletest has been changed a lot recently)

@Manishearth
Copy link
Owner

Should be a major version bump, then?

@Manishearth
Copy link
Owner

I'm fine with landing this first, fixing up clippy, and later landing CI.

@mcarton
Copy link
Contributor Author

mcarton commented Mar 14, 2016

The example script on the README should not be broken by the way (Clippy’s own tests/compile-test.rs needs no change).

Manishearth added a commit that referenced this pull request Mar 15, 2016
Update to 1.9.0-nightly (74b886ab1 2016-03-13)
@Manishearth Manishearth merged commit 2d35bb4 into Manishearth:master Mar 15, 2016
@Manishearth
Copy link
Owner

published as 0.1.0

@Manishearth
Copy link
Owner

Doesn't seem to be enough to rustup, we're getting trouble with overlapping dependencies

https://travis-ci.org/Manishearth/rust-clippy/builds/116076516

@mcarton mcarton deleted the rustup branch March 15, 2016 10:47
@mcarton
Copy link
Contributor Author

mcarton commented Mar 15, 2016

Looks like regex-syntax 0.3 has been published, something wants to use that but our regex-syntax dep is 0.2.2. Try updating it to 0.3.0 in Cargo.toml maybe?

@Manishearth
Copy link
Owner

Yeah. Part of the problem is that unlike cargo compiletest doesn't know how to select deps with extern flags. I'll have a look at the deptree later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants