Update unit tests to accomodate for improved error.

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
index 36dd78dd2b19a28d9571f486396251fb7795bf23..d20e79b9db3384990fac26906a7fe21316f47e71 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a(b=c)
-// error-pattern: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
index 1e7922a9ff15535ef24359ba1b9b69c7d70a5ea0..3a12e97868000498ecfb2163553873e0a0145310 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-1.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a(b=c)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
index 48d656a4a28d92ffac76fb6aaf0a5d789c6c9c95..660d5d1b1ea90c6d8aa75de19afd5c19c033ff4e 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a{b}
-// error-pattern: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
index b92e1fd3d97cff2a1908fe2fb33048b76851b5c5..2e141137129dca8559f2909c008c868e29d2f3e8 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-2.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a{b}` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
index e7dfa17b4b6c414a9cd3132cad8e1f2013a5c204..d8b3c0284cca64b25e1c8a83058e4a933057839c 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a(b)
-// error-pattern: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
index 6853a69b9eb226380fc928143065ece5d8b7cee0..52685d7b4a2330fcbaacb67017b87d6baeb9e091 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-4.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a(b)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
index 9fa726f93e3eada91f18a11e4d3d7a95964e78fd..4a0d116e644b5acd1f337a3a01d727e1db687dcb 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg a{
-// error-pattern: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
index 7d2087b4b71f71f91d05f30017635547ebbf896b..618d12aba68e9bd5a97c829b438f40c6634cb7a4 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-6.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `a{` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
index 1d7fa7885348ef8509bad200af0ca22c1810fde2..7c5531606fa347b639228d0cb0b539ccbe5fef3f 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.rs
@@ -1,3 +1,3 @@
 // compile-flags: --cfg )
-// error-pattern: invalid `--cfg` argument: `)` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 fn main() {}

diff --git a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
index 7bb1814127b292e43a0b26c6d8a05cd707ccf3a9..16bb552f0d99948c13d84ece955053e11e16e066 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
+++ b/src/test/ui/conditional-compilation/cfg-arg-invalid-8.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `)` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `)` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 

diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs b/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
index 9e34cacf74d2a0858c00e04fa285f220e89edc92..c23d2cee924b72e4e46dd604d21937513bc19229 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
+++ b/src/test/ui/conditional-compilation/cfg-empty-codemap.rs
@@ -2,7 +2,7 @@
 
 // compile-flags: --cfg ""
 
-// error-pattern: invalid `--cfg` argument: `""` (expected `key` or `key="value"`)
+// error-pattern: invalid `--cfg` argument: `""` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")
 
 pub fn main() {
 }

diff --git a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr b/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
index 128e3cd730680cfaacb08a40207d880bf50a4fc2..55e3dc131ae9f186269837265d0cd8392f13c672 100644 (file)
--- a/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
+++ b/src/test/ui/conditional-compilation/cfg-empty-codemap.stderr
@@ -1,2 +1,2 @@
-error: invalid `--cfg` argument: `""` (expected `key` or `key="value"`)
+error: invalid `--cfg` argument: `""` (expected `key` or `key="value"`, ensure escaping is appropriate for your shell, try 'key="value"' or key=\"value\")