From d6a1428609f468ad633972b0bcd0b2f1c67dec37 Mon Sep 17 00:00:00 2001 From: Julian Wollersberger <24991778+Julian-Wollersberger@users.noreply.github.com> Date: Sun, 3 May 2020 19:02:52 +0200 Subject: [PATCH] Rephrased error message for disallowed sections in virtual workspace --- src/cargo/util/toml/mod.rs | 26 +++++++++++++------------- tests/testsuite/workspaces.rs | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index c7858deffb1..246bd37f145 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -1320,43 +1320,43 @@ impl TomlManifest { config: &Config, ) -> CargoResult<(VirtualManifest, Vec)> { if me.project.is_some() { - bail!("virtual manifests do not define [project]"); + bail!("this virtual manifest specifies a [project] section, which is not allowed"); } if me.package.is_some() { - bail!("virtual manifests do not define [package]"); + bail!("this virtual manifest specifies a [package] section, which is not allowed"); } if me.lib.is_some() { - bail!("virtual manifests do not specify [lib]"); + bail!("this virtual manifest specifies a [lib] section, which is not allowed"); } if me.bin.is_some() { - bail!("virtual manifests do not specify [[bin]]"); + bail!("this virtual manifest specifies a [[bin]] section, which is not allowed"); } if me.example.is_some() { - bail!("virtual manifests do not specify [[example]]"); + bail!("this virtual manifest specifies a [[example]] section, which is not allowed"); } if me.test.is_some() { - bail!("virtual manifests do not specify [[test]]"); + bail!("this virtual manifest specifies a [[test]] section, which is not allowed"); } if me.bench.is_some() { - bail!("virtual manifests do not specify [[bench]]"); + bail!("this virtual manifest specifies a [[bench]] section, which is not allowed"); } if me.dependencies.is_some() { - bail!("virtual manifests do not specify [dependencies]"); + bail!("this virtual manifest specifies a [dependencies] section, which is not allowed"); } if me.dev_dependencies.is_some() || me.dev_dependencies2.is_some() { - bail!("virtual manifests do not specify [dev-dependencies]"); + bail!("this virtual manifest specifies a [dev-dependencies] section, which is not allowed"); } if me.build_dependencies.is_some() || me.build_dependencies2.is_some() { - bail!("virtual manifests do not specify [build-dependencies]"); + bail!("this virtual manifest specifies a [build-dependencies] section, which is not allowed"); } if me.features.is_some() { - bail!("virtual manifests do not specify [features]"); + bail!("this virtual manifest specifies a [features] section, which is not allowed"); } if me.target.is_some() { - bail!("virtual manifests do not specify [target]"); + bail!("this virtual manifest specifies a [target] section, which is not allowed"); } if me.badges.is_some() { - bail!("virtual manifests do not specify [badges]"); + bail!("this virtual manifest specifies a [badges] section, which is not allowed"); } let mut nested_paths = Vec::new(); diff --git a/tests/testsuite/workspaces.rs b/tests/testsuite/workspaces.rs index 0dfb43b6d0a..42ba045a6ab 100644 --- a/tests/testsuite/workspaces.rs +++ b/tests/testsuite/workspaces.rs @@ -2117,7 +2117,7 @@ fn ws_err_unused() { [ERROR] failed to parse manifest at `[..]/foo/Cargo.toml` Caused by: - virtual manifests do not specify {} + this virtual manifest specifies a {} section, which is not allowed ", key ))