Update to Rust master and eliminate warnings

diff --git a/libs/rust-toml b/libs/rust-toml
index 5f3dfd9b5461d161fbdfa0e4cbe3e7a2e2e11ff4..2f9e556c4ec1aa492884c951745699552494264b 160000 (submodule)
--- a/libs/rust-toml
+++ b/libs/rust-toml
@@ -1 +1 @@
-Subproject commit 5f3dfd9b5461d161fbdfa0e4cbe3e7a2e2e11ff4
+Subproject commit 2f9e556c4ec1aa492884c951745699552494264b

diff --git a/src/bin/cargo-compile.rs b/src/bin/cargo-compile.rs
index baff57f7b2e954c883d66d7fc83a0c45273c6ee4..7710cead9676c5664a3798ddcbd435625f2e27a4 100644 (file)
--- a/src/bin/cargo-compile.rs
+++ b/src/bin/cargo-compile.rs
@@ -1,12 +1,11 @@
 #![crate_id="cargo-compile"]
-#![allow(deprecated_owned_vector)]
 #![feature(phase)]
 
 extern crate cargo;
 extern crate hammer;
 extern crate serialize;
 
-#[phase(syntax, link)]
+#[phase(plugin, link)]
 extern crate log;
 
 use std::os;

diff --git a/src/bin/cargo-read-manifest.rs b/src/bin/cargo-read-manifest.rs
index 63a72293f8f1bff26515a348f2cb89815c54cd8e..bb4a66918bb47d23cc0589b94080214c6d3ea45b 100644 (file)
--- a/src/bin/cargo-read-manifest.rs
+++ b/src/bin/cargo-read-manifest.rs
@@ -1,5 +1,4 @@
 #![crate_id="cargo-read-manifest"]
-#![allow(deprecated_owned_vector)]
 
 extern crate cargo;
 extern crate serialize;

diff --git a/src/bin/cargo-rustc.rs b/src/bin/cargo-rustc.rs
index 1e9e7e959b0a1a3488a6969104db4a720ddf7691..2272fb6bd36fe754a9998bbaeac54a4290baa75f 100644 (file)
--- a/src/bin/cargo-rustc.rs
+++ b/src/bin/cargo-rustc.rs
@@ -1,5 +1,4 @@
 #![crate_id="cargo-rustc"]
-#![allow(deprecated_owned_vector)]
 
 extern crate cargo;
 

diff --git a/src/bin/cargo-verify-project.rs b/src/bin/cargo-verify-project.rs
index c123d2401b279370bb865be89bf6149e29508aff..974cfaed5f7e8a5e0afdee39b7756e8f12da7aeb 100644 (file)
--- a/src/bin/cargo-verify-project.rs
+++ b/src/bin/cargo-verify-project.rs
@@ -1,5 +1,4 @@
 #![crate_id="cargo-verify-project"]
-#![allow(deprecated_owned_vector)]
 
 extern crate toml = "github.com/mneumann/rust-toml#toml";
 extern crate getopts;

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index cdec169670a75df43ac61670b768a80f13f53227..96f2ecb624292be693f62b8f0e246ad65e9980d3 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -4,7 +4,7 @@ extern crate cargo;
 extern crate toml = "github.com/mneumann/rust-toml#toml";
 extern crate hammer;
 extern crate serialize;
-#[phase(syntax, link)]
+#[phase(plugin, link)]
 extern crate log;
 
 use hammer::{FlagConfig,FlagConfiguration};

diff --git a/src/cargo/core/resolver.rs b/src/cargo/core/resolver.rs
index 3308cc581c2cab397a6cfff77ec2a2f2471f3ab4..51f7bee073fd080a1abd26ee80d011412da7f28f 100644 (file)
--- a/src/cargo/core/resolver.rs
+++ b/src/cargo/core/resolver.rs
@@ -11,7 +11,6 @@ use util::result::CargoResult;
  * - The correct input here is not a registry. Resolves should be performable
  * on package summaries vs. the packages themselves.
  */
-#[allow(dead_code)]
 pub fn resolve(deps: &[Dependency], registry: &Registry) -> CargoResult<Vec<NameVer>> {
     let mut remaining = Vec::from_slice(deps);
     let mut resolve = HashMap::<&str, &Summary>::new();

diff --git a/src/cargo/core/version_req.rs b/src/cargo/core/version_req.rs
index 0c995658e1cbd7ace81e00e7c86360e21051daf2..656196d4316f7eb71f4a70209dc4602f110393e3 100644 (file)
--- a/src/cargo/core/version_req.rs
+++ b/src/cargo/core/version_req.rs
@@ -1,6 +1,3 @@
-// Work in progress
-#![allow(dead_code)]
-
 use std::fmt;
 use std::str::CharOffsets;
 use semver::Version;
@@ -140,14 +137,6 @@ impl Predicate {
 
         false
     }
-
-    fn get_minor(&self) -> uint {
-        self.minor.unwrap()
-    }
-
-    fn get_patch(&self) -> uint {
-        self.patch.unwrap()
-    }
 }
 
 impl PredBuilder {
@@ -255,14 +244,6 @@ impl<'a> Lexer<'a> {
         }
     }
 
-    fn is_marked(&self) -> bool {
-        self.mark.is_some()
-    }
-
-    fn is_success(&self) -> bool {
-        self.state == LexWin
-    }
-
     fn is_error(&self) -> bool {
         self.state == LexErr
     }

diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs
index a4e693ad45aa64af3680ff141fa28e9fd5184c19..ed65a4583c3926d1552c8ef5b07d8785da344415 100644 (file)
--- a/src/cargo/lib.rs
+++ b/src/cargo/lib.rs
@@ -1,7 +1,6 @@
 #![crate_id="cargo"]
 #![crate_type="rlib"]
 
-#![allow(deprecated_owned_vector)]
 #![feature(macro_rules,phase)]
 
 extern crate debug;
@@ -12,7 +11,7 @@ extern crate semver;
 extern crate hammer;
 extern crate toml = "github.com/mneumann/rust-toml#toml";
 
-#[phase(syntax, link)]
+#[phase(plugin, link)]
 extern crate log;
 
 #[cfg(test)]

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index 746e31de224e5a31baaa81401d9b13ccba5c2654..540d0a305ebc8d9c0bf820043182e483a6f535f4 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -88,11 +88,6 @@ pub fn all_configs(pwd: Path) -> CargoResult<HashMap<String, ConfigValue>> {
     Ok(map)
 }
 
-#[allow(unused_variable)]
-pub fn set_config(key: String, value: String, location: Location) -> CargoResult<()> {
-    Ok(())
-}
-
 fn find_in_tree<T>(pwd: &Path, walk: |io::fs::File| -> CargoResult<T>) -> CargoResult<T> {
     let mut current = pwd.clone();
 

diff --git a/tests/tests.rs b/tests/tests.rs
index d432077085a7415fa820cefd3c115db3cfea4bd8..c9dfb93e2dfd3d54f2f986b9a7eb308e0162bb62 100644 (file)
--- a/tests/tests.rs
+++ b/tests/tests.rs
@@ -1,12 +1,11 @@
 #![feature(macro_rules)]
-#![allow(deprecated_owned_vector)]
 #![feature(phase)]
 
 extern crate term;
 extern crate cargo;
 extern crate hamcrest;
 
-#[phase(syntax, link)]
+#[phase(plugin, link)]
 extern crate log;
 
 macro_rules! test(