From 4cd544cd6fbaf285a811c97ffed3f3e3a906e6e0 Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Wed, 4 Oct 2017 21:24:26 +0200 Subject: [PATCH] Fix error message when Cargo.toml misses a [package] section, remove an unused import --- src/cargo/util/toml/mod.rs | 2 +- tests/build.rs | 2 +- tests/jobserver.rs | 1 - tests/metadata.rs | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index c2220ac2d6e..e9e7fe8aeee 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -513,7 +513,7 @@ impl TomlManifest { let project = me.project.as_ref().or_else(|| me.package.as_ref()); let project = project.ok_or_else(|| { - CargoError::from("no `package` or `project` section found.") + CargoError::from("no `package` section found.") })?; let package_name = project.name.trim(); diff --git a/tests/build.rs b/tests/build.rs index 3bc34ca3a2b..f8fc6e912c0 100644 --- a/tests/build.rs +++ b/tests/build.rs @@ -92,7 +92,7 @@ fn cargo_compile_with_invalid_manifest() { [ERROR] failed to parse manifest at `[..]` Caused by: - no `package` or `project` section found. + no `package` section found. ")) } diff --git a/tests/jobserver.rs b/tests/jobserver.rs index 7356c73b0a2..2e7e8b81624 100644 --- a/tests/jobserver.rs +++ b/tests/jobserver.rs @@ -1,7 +1,6 @@ extern crate cargotest; extern crate hamcrest; -use std::str; use std::net::TcpListener; use std::thread; use std::process::Command; diff --git a/tests/metadata.rs b/tests/metadata.rs index 25a0edf01e5..6293e164805 100644 --- a/tests/metadata.rs +++ b/tests/metadata.rs @@ -547,7 +547,7 @@ fn cargo_metadata_with_invalid_manifest() { [ERROR] failed to parse manifest at `[..]` Caused by: - no `package` or `project` section found.")) + no `package` section found.")) } const MANIFEST_OUTPUT: &'static str=