Upgrade rust/crates/paste to 1.0.0 am: 4117715894 am: ffccca4fd9 am: e4ed7fa7ff

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/paste/+/1372673

Change-Id: I1672e3875d54a88b9db186e1375d9f7f3f2a9be5

28 files changed, 71 insertions, 43 deletions

diff --git a/tests/ui/case-warning.rs b/tests/ui/case-warning.rs
index 4b41ab6..fdea4d6 100644
--- a/tests/ui/case-warning.rs
+++ b/tests/ui/case-warning.rs
@@ -1,8 +1,10 @@
 #![deny(warnings)]
 
+use paste::paste;
+
 macro_rules! m {
     ($i:ident) => {
-        paste::item! {
+        paste! {
             pub fn [<foo $i>]() {}
         }
     };
diff --git a/tests/ui/case-warning.stderr b/tests/ui/case-warning.stderr
index 5bf37a0..d140c19 100644
--- a/tests/ui/case-warning.stderr
+++ b/tests/ui/case-warning.stderr
@@ -1,10 +1,10 @@
 error: function `fooBar` should have a snake case name
-  --> $DIR/case-warning.rs:6:20
+  --> $DIR/case-warning.rs:8:20
    |
-6  |             pub fn [<foo $i>]() {}
+8  |             pub fn [<foo $i>]() {}
    |                    ^^^^^^^^^^ help: convert the identifier to snake case: `foo_bar`
 ...
-11 | m!(Bar);
+13 | m!(Bar);
    | -------- in this macro invocation
    |
 note: the lint level is defined here
diff --git a/tests/ui/env-empty.rs b/tests/ui/env-empty.rs
index d1682f5..1e9f2d0 100644
--- a/tests/ui/env-empty.rs
+++ b/tests/ui/env-empty.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<env!()>]() {}
 }
 
diff --git a/tests/ui/env-empty.stderr b/tests/ui/env-empty.stderr
index ef8f362..3e4d4da 100644
--- a/tests/ui/env-empty.stderr
+++ b/tests/ui/env-empty.stderr
@@ -1,5 +1,5 @@
 error: expected string literal as argument to env! macro
- --> $DIR/env-empty.rs:2:10
+ --> $DIR/env-empty.rs:4:10
   |
-2 |     fn [<env!()>]() {}
+4 |     fn [<env!()>]() {}
   |          ^^^^^^
diff --git a/tests/ui/env-non-string.rs b/tests/ui/env-non-string.rs
index d35a445..55255ef 100644
--- a/tests/ui/env-non-string.rs
+++ b/tests/ui/env-non-string.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<env!(1.31)>]() {}
 }
 
diff --git a/tests/ui/env-non-string.stderr b/tests/ui/env-non-string.stderr
index 007ebcf..7988800 100644
--- a/tests/ui/env-non-string.stderr
+++ b/tests/ui/env-non-string.stderr
@@ -1,5 +1,5 @@
 error: expected string literal
- --> $DIR/env-non-string.rs:2:15
+ --> $DIR/env-non-string.rs:4:15
   |
-2 |     fn [<env!(1.31)>]() {}
+4 |     fn [<env!(1.31)>]() {}
   |               ^^^^
diff --git a/tests/ui/env-suffix.rs b/tests/ui/env-suffix.rs
index cd9e15e..b5c60af 100644
--- a/tests/ui/env-suffix.rs
+++ b/tests/ui/env-suffix.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<env!("VAR"suffix)>]() {}
 }
 
diff --git a/tests/ui/env-suffix.stderr b/tests/ui/env-suffix.stderr
index c696fa1..82fad8b 100644
--- a/tests/ui/env-suffix.stderr
+++ b/tests/ui/env-suffix.stderr
@@ -1,5 +1,5 @@
 error: expected string literal
- --> $DIR/env-suffix.rs:2:15
+ --> $DIR/env-suffix.rs:4:15
   |
-2 |     fn [<env!("VAR"suffix)>]() {}
+4 |     fn [<env!("VAR"suffix)>]() {}
   |               ^^^^^^^^^^^
diff --git a/tests/ui/env-unexpected.rs b/tests/ui/env-unexpected.rs
index 1a34ae8..39cb770 100644
--- a/tests/ui/env-unexpected.rs
+++ b/tests/ui/env-unexpected.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<env!("VAR" "VAR")>]() {}
 }
 
diff --git a/tests/ui/env-unexpected.stderr b/tests/ui/env-unexpected.stderr
index 63095de..01bf722 100644
--- a/tests/ui/env-unexpected.stderr
+++ b/tests/ui/env-unexpected.stderr
@@ -1,5 +1,5 @@
 error: unexpected token in env! macro
- --> $DIR/env-unexpected.rs:2:21
+ --> $DIR/env-unexpected.rs:4:21
   |
-2 |     fn [<env!("VAR" "VAR")>]() {}
+4 |     fn [<env!("VAR" "VAR")>]() {}
   |                     ^^^^^
diff --git a/tests/ui/invalid-ident.rs b/tests/ui/invalid-ident.rs
index 529896d..d566e65 100644
--- a/tests/ui/invalid-ident.rs
+++ b/tests/ui/invalid-ident.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<0 f>]() {}
 }
 
diff --git a/tests/ui/invalid-ident.stderr b/tests/ui/invalid-ident.stderr
index bec43c4..2c70cc8 100644
--- a/tests/ui/invalid-ident.stderr
+++ b/tests/ui/invalid-ident.stderr
@@ -1,5 +1,5 @@
 error: `"0f"` is not a valid identifier
- --> $DIR/invalid-ident.rs:2:8
+ --> $DIR/invalid-ident.rs:4:8
   |
-2 |     fn [<0 f>]() {}
+4 |     fn [<0 f>]() {}
   |        ^^^^^^^
diff --git a/tests/ui/missing-paren-on-env.rs b/tests/ui/missing-paren-on-env.rs
index b8a51b0..44fefbd 100644
--- a/tests/ui/missing-paren-on-env.rs
+++ b/tests/ui/missing-paren-on-env.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<env! huh>]() {}
 }
 
diff --git a/tests/ui/missing-paren-on-env.stderr b/tests/ui/missing-paren-on-env.stderr
index 6e99bea..64f0391 100644
--- a/tests/ui/missing-paren-on-env.stderr
+++ b/tests/ui/missing-paren-on-env.stderr
@@ -1,5 +1,5 @@
 error: expected `(`
- --> $DIR/missing-paren-on-env.rs:2:15
+ --> $DIR/missing-paren-on-env.rs:4:15
   |
-2 |     fn [<env! huh>]() {}
+4 |     fn [<env! huh>]() {}
   |               ^^^
diff --git a/tests/ui/no-env-var.rs b/tests/ui/no-env-var.rs
index 87aad35..c6d8c3d 100644
--- a/tests/ui/no-env-var.rs
+++ b/tests/ui/no-env-var.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<a env!("PASTE_UNKNOWN") b>]() {}
 }
 
diff --git a/tests/ui/no-env-var.stderr b/tests/ui/no-env-var.stderr
index e79d148..9255a8f 100644
--- a/tests/ui/no-env-var.stderr
+++ b/tests/ui/no-env-var.stderr
@@ -1,5 +1,5 @@
 error: no such env var: "PASTE_UNKNOWN"
- --> $DIR/no-env-var.rs:2:17
+ --> $DIR/no-env-var.rs:4:17
   |
-2 |     fn [<a env!("PASTE_UNKNOWN") b>]() {}
+4 |     fn [<a env!("PASTE_UNKNOWN") b>]() {}
   |                 ^^^^^^^^^^^^^^^
diff --git a/tests/ui/no-ident-after-colon.rs b/tests/ui/no-ident-after-colon.rs
index 83a25d3..50b3b0d 100644
--- a/tests/ui/no-ident-after-colon.rs
+++ b/tests/ui/no-ident-after-colon.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<name:0>]() {}
 }
 
diff --git a/tests/ui/no-ident-after-colon.stderr b/tests/ui/no-ident-after-colon.stderr
index 2f36bac..928316f 100644
--- a/tests/ui/no-ident-after-colon.stderr
+++ b/tests/ui/no-ident-after-colon.stderr
@@ -1,5 +1,5 @@
 error: expected identifier after `:`
- --> $DIR/no-ident-after-colon.rs:2:15
+ --> $DIR/no-ident-after-colon.rs:4:15
   |
-2 |     fn [<name:0>]() {}
+4 |     fn [<name:0>]() {}
   |               ^
diff --git a/tests/ui/unexpected-group.rs b/tests/ui/unexpected-group.rs
index 9fed522..63ee516 100644
--- a/tests/ui/unexpected-group.rs
+++ b/tests/ui/unexpected-group.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<a {} b>]() {}
 }
 
diff --git a/tests/ui/unexpected-group.stderr b/tests/ui/unexpected-group.stderr
index c5d4a82..4d05139 100644
--- a/tests/ui/unexpected-group.stderr
+++ b/tests/ui/unexpected-group.stderr
@@ -1,5 +1,5 @@
 error: unexpected token
- --> $DIR/unexpected-group.rs:2:12
+ --> $DIR/unexpected-group.rs:4:12
   |
-2 |     fn [<a {} b>]() {}
+4 |     fn [<a {} b>]() {}
   |            ^^
diff --git a/tests/ui/unexpected-modifier.rs b/tests/ui/unexpected-modifier.rs
index 00a1e99..99fe68f 100644
--- a/tests/ui/unexpected-modifier.rs
+++ b/tests/ui/unexpected-modifier.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<:lower x>]() {}
 }
 
diff --git a/tests/ui/unexpected-modifier.stderr b/tests/ui/unexpected-modifier.stderr
index 4a518b8..513835c 100644
--- a/tests/ui/unexpected-modifier.stderr
+++ b/tests/ui/unexpected-modifier.stderr
@@ -1,5 +1,5 @@
 error: unexpected modifier
- --> $DIR/unexpected-modifier.rs:2:10
+ --> $DIR/unexpected-modifier.rs:4:10
   |
-2 |     fn [<:lower x>]() {}
+4 |     fn [<:lower x>]() {}
   |          ^^^^^^
diff --git a/tests/ui/unexpected-punct.rs b/tests/ui/unexpected-punct.rs
index b2313b5..d0edb92 100644
--- a/tests/ui/unexpected-punct.rs
+++ b/tests/ui/unexpected-punct.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<a + b>]() {}
 }
 
diff --git a/tests/ui/unexpected-punct.stderr b/tests/ui/unexpected-punct.stderr
index 9564310..456d172 100644
--- a/tests/ui/unexpected-punct.stderr
+++ b/tests/ui/unexpected-punct.stderr
@@ -1,5 +1,5 @@
 error: unexpected punct
- --> $DIR/unexpected-punct.rs:2:12
+ --> $DIR/unexpected-punct.rs:4:12
   |
-2 |     fn [<a + b>]() {}
+4 |     fn [<a + b>]() {}
   |            ^
diff --git a/tests/ui/unsupported-literal.rs b/tests/ui/unsupported-literal.rs
index d3768bd..6538971 100644
--- a/tests/ui/unsupported-literal.rs
+++ b/tests/ui/unsupported-literal.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<1e+100>]() {}
 }
 
diff --git a/tests/ui/unsupported-literal.stderr b/tests/ui/unsupported-literal.stderr
index 30fe5b4..0167999 100644
--- a/tests/ui/unsupported-literal.stderr
+++ b/tests/ui/unsupported-literal.stderr
@@ -1,5 +1,5 @@
 error: unsupported literal
- --> $DIR/unsupported-literal.rs:2:10
+ --> $DIR/unsupported-literal.rs:4:10
   |
-2 |     fn [<1e+100>]() {}
+4 |     fn [<1e+100>]() {}
   |          ^^^^^^
diff --git a/tests/ui/unsupported-modifier.rs b/tests/ui/unsupported-modifier.rs
index 5ab049f..a65b36a 100644
--- a/tests/ui/unsupported-modifier.rs
+++ b/tests/ui/unsupported-modifier.rs
@@ -1,4 +1,6 @@
-paste::item! {
+use paste::paste;
+
+paste! {
     fn [<a:pillow>]() {}
 }
 
diff --git a/tests/ui/unsupported-modifier.stderr b/tests/ui/unsupported-modifier.stderr
index ffbc742..bfb9697 100644
--- a/tests/ui/unsupported-modifier.stderr
+++ b/tests/ui/unsupported-modifier.stderr
@@ -1,5 +1,5 @@
 error: unsupported modifier
- --> $DIR/unsupported-modifier.rs:2:11
+ --> $DIR/unsupported-modifier.rs:4:11
   |
-2 |     fn [<a:pillow>]() {}
+4 |     fn [<a:pillow>]() {}
   |           ^^^^^^^