Auto merge of #4579 - mdevlamynck:issue-3388, r=alexcrichton

Fix error message when Cargo.toml misses a [package] section

Fixes #3388.

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();

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.
 "))
 }
 

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;

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=