mirror of
https://github.com/rust-lang/cargo
synced 2024-10-01 05:23:56 +00:00
Update to Rust master and eliminate warnings
This commit is contained in:
parent
92602f6db0
commit
1124727c96
|
@ -1 +1 @@
|
|||
Subproject commit 5f3dfd9b5461d161fbdfa0e4cbe3e7a2e2e11ff4
|
||||
Subproject commit 2f9e556c4ec1aa492884c951745699552494264b
|
|
@ -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;
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#![crate_id="cargo-read-manifest"]
|
||||
#![allow(deprecated_owned_vector)]
|
||||
|
||||
extern crate cargo;
|
||||
extern crate serialize;
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#![crate_id="cargo-rustc"]
|
||||
#![allow(deprecated_owned_vector)]
|
||||
|
||||
extern crate cargo;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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};
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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)]
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue