Fix merge issues.

[rust.git] / Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 51778cd38713965bf4a0aea6d365e1305b39909f..047d966be666a5f84c11948adc34b6fe8b093667 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.139"
+version = "0.0.169"
 authors = [
        "Manish Goregaokar <manishsmail@gmail.com>",
        "Andre Bogus <bogusandre@gmail.com>",
@@ -9,16 +9,16 @@ authors = [
        "Oliver Schneider <clippy-iethah7aipeen8neex1a@oli-obk.de>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/Manishearth/rust-clippy"
+repository = "https://github.com/rust-lang-nursery/rust-clippy"
 readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
-workspace = "clippy_tests"
+build = "build.rs"
 
 [badges]
-travis-ci = { repository = "Manishearth/rust-clippy" }
-appveyor = { repository = "Manishearth/rust-clippy" }
+travis-ci = { repository = "rust-lang-nursery/rust-clippy" }
+appveyor = { repository = "rust-lang-nursery/rust-clippy" }
 
 [lib]
 name = "clippy"
@@ -28,15 +28,21 @@ test = false
 [[bin]]
 name = "cargo-clippy"
 test = false
+path = "src/main.rs"
+
+[[bin]]
+name = "clippy-driver"
+test = false
+path = "src/driver.rs"
 
 [dependencies]
 # begin automatic update
-clippy_lints = { version = "0.0.139", path = "clippy_lints" }
+clippy_lints = { version = "0.0.169", path = "clippy_lints" }
 # end automatic update
 cargo_metadata = "0.2"
 
 [dev-dependencies]
-compiletest_rs = "0.2.6"
+compiletest_rs = "0.2.7"
 duct = "0.8.2"
 lazy_static = "0.2"
 regex = "0.2"