Skip to content

Commit

Permalink
Merge bb3dd98 into 8cae0b0
Browse files Browse the repository at this point in the history
  • Loading branch information
killercup committed Oct 16, 2015
2 parents 8cae0b0 + bb3dd98 commit 1311e2b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ semver = "0.1"
toml = "0.1"
curl = "0.2.11"
quick-error = "0.1.3"
clippy = {version = "0.0.19", optional = true}
clippy = {version = "0.0.21", optional = true}

[dev-dependencies]
assert_cli = "0.1.0"
Expand Down
2 changes: 1 addition & 1 deletion src/bin/add/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl Args {
parse_path(path.clone())
} else {
get_latest_version(&self.arg_crate)
.map(|v| toml::Value::String(v))
.map(toml::Value::String)
.map_err(From::from)
};

Expand Down
4 changes: 2 additions & 2 deletions src/bin/list/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ fn get_packages(lock_file: &toml::Table) -> Result<Packages, Box<Error>> {
}

fn list_deps_helper(pkgs: &Packages,
deps: &Dependencies,
deps: &[Dependency],
levels: &mut Vec<bool>)
-> Result<String, Box<Error>> {
let mut output = String::new();
Expand Down Expand Up @@ -126,7 +126,7 @@ fn list_deps_helper(pkgs: &Packages,
Ok(output)
}

fn list_deps(pkgs: &Packages, deps: &Dependencies) -> Result<String, Box<Error>> {
fn list_deps(pkgs: &Packages, deps: &[Dependency]) -> Result<String, Box<Error>> {
list_deps_helper(pkgs, deps, &mut vec![])
}

Expand Down
1 change: 1 addition & 0 deletions src/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ impl Manifest {
/// assert!(manifest.remove_from_table("dependencies", &dep.0).is_err());
/// # }
/// ```
#[cfg_attr(feature = "dev", allow(toplevel_ref_arg))]
pub fn remove_from_table(&mut self, table: &str, name: &str) -> Result<(), ManifestError> {
let ref mut manifest = self.data;
let entry = manifest.entry(String::from(table));
Expand Down

0 comments on commit 1311e2b

Please sign in to comment.