Update ui tests to 2018 edition

tests/compiletest.rs

@@ -5,7 +5,14 @@ fn ui() {
     compiletest::run_tests(&compiletest::Config {
         mode: compiletest::common::Mode::Ui,
         src_base: std::path::PathBuf::from("tests/ui"),
-        target_rustcflags: Some(String::from("-L tests/deps/target/debug/deps")),
+        target_rustcflags: Some(String::from(
+            "\
+             --edition=2018 \
+             -L tests/deps/target/debug/deps \
+             -Z unstable-options \
+             --extern serde_json \
+             ",
+        )),
         ..Default::default()
     });
 }

tests/ui/missing_colon.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "a" });

tests/ui/missing_colon.stderr

@@ -1,7 +1,7 @@
 error: unexpected end of macro invocation
- --> $DIR/missing_colon.rs:5:5
+ --> $DIR/missing_colon.rs:4:5
   |
-5 |     json!({ "a" });
+4 |     json!({ "a" });
   |     ^^^^^^^^^^^^^^^ missing tokens in macro arguments
   |
   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

tests/ui/missing_value.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "a" : });

tests/ui/missing_value.stderr

@@ -1,7 +1,7 @@
 error: unexpected end of macro invocation
- --> $DIR/missing_value.rs:5:5
+ --> $DIR/missing_value.rs:4:5
   |
-5 |     json!({ "a" : });
+4 |     json!({ "a" : });
   |     ^^^^^^^^^^^^^^^^^ missing tokens in macro arguments
   |
   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

tests/ui/not_found.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "a" : x });

tests/ui/not_found.stderr

@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `x` in this scope
- --> $DIR/not_found.rs:5:19
+ --> $DIR/not_found.rs:4:19
   |
-5 |     json!({ "a" : x });
+4 |     json!({ "a" : x });
   |                   ^ not found in this scope
 
 error: aborting due to previous error

tests/ui/parse_expr.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "a" : ~ });

tests/ui/parse_expr.stderr

@@ -1,7 +1,7 @@
 error: unexpected end of macro invocation
- --> $DIR/parse_expr.rs:5:5
+ --> $DIR/parse_expr.rs:4:5
   |
-5 |     json!({ "a" : ~ });
+4 |     json!({ "a" : ~ });
   |     ^^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments
   |
   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)

tests/ui/parse_key.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "".s : true });

tests/ui/parse_key.stderr

@@ -1,7 +1,7 @@
 error[E0609]: no field `s` on type `&'static str`
- --> $DIR/parse_key.rs:5:16
+ --> $DIR/parse_key.rs:4:16
   |
-5 |     json!({ "".s : true });
+4 |     json!({ "".s : true });
   |                ^
 
 error: aborting due to previous error

tests/ui/unexpected_after_array_element.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!([ true => ]);

tests/ui/unexpected_after_array_element.stderr

@@ -1,7 +1,7 @@
 error: no rules expected the token `=>`
- --> $DIR/unexpected_after_array_element.rs:5:18
+ --> $DIR/unexpected_after_array_element.rs:4:18
   |
-5 |     json!([ true => ]);
+4 |     json!([ true => ]);
   |                  ^^ no rules expected this token in macro call
 
 error: aborting due to previous error

tests/ui/unexpected_after_map_entry.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "k": true => });

tests/ui/unexpected_after_map_entry.stderr

@@ -1,7 +1,7 @@
 error: no rules expected the token `=>`
- --> $DIR/unexpected_after_map_entry.rs:5:23
+ --> $DIR/unexpected_after_map_entry.rs:4:23
   |
-5 |     json!({ "k": true => });
+4 |     json!({ "k": true => });
   |                       ^^ no rules expected this token in macro call
 
 error: aborting due to previous error

tests/ui/unexpected_colon.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ : true });

tests/ui/unexpected_colon.stderr

@@ -1,7 +1,7 @@
 error: no rules expected the token `:`
- --> $DIR/unexpected_colon.rs:5:13
+ --> $DIR/unexpected_colon.rs:4:13
   |
-5 |     json!({ : true });
+4 |     json!({ : true });
   |             ^ no rules expected this token in macro call
 
 error: aborting due to previous error

tests/ui/unexpected_comma.rs

@@ -1,5 +1,4 @@
-#[macro_use]
+use serde_json::json;
-extern crate serde_json;
 
 fn main() {
     json!({ "a" , "b": true });

tests/ui/unexpected_comma.stderr

@@ -1,7 +1,7 @@
 error: no rules expected the token `,`
- --> $DIR/unexpected_comma.rs:5:17
+ --> $DIR/unexpected_comma.rs:4:17
   |
-5 |     json!({ "a" , "b": true });
+4 |     json!({ "a" , "b": true });
   |                 ^ no rules expected this token in macro call
 
 error: aborting due to previous error