Update paste to 1.0.6

Test: cd external/rust/crates && atest --host -c
Change-Id: I9cd862265c9835e9a18117d88179932f096eec9d

16 files changed, 35 insertions, 20 deletions

diff --git a/tests/test_attr.rs b/tests/test_attr.rs
index f2a5bf0..c880eac 100644
--- a/tests/test_attr.rs
+++ b/tests/test_attr.rs
@@ -43,3 +43,18 @@ fn test_paste_cfg() {
 
     let _ = new;
 }
+
+#[test]
+fn test_path_in_attr() {
+    macro_rules! m {
+        (#[x = $x:ty]) => {
+            stringify!($x)
+        };
+    }
+
+    let ty = paste! {
+        m!(#[x = foo::Bar])
+    };
+
+    assert_eq!("foo::Bar", ty);
+}
diff --git a/tests/test_expr.rs b/tests/test_expr.rs
index e8386d0..a61bd03 100644
--- a/tests/test_expr.rs
+++ b/tests/test_expr.rs
@@ -10,8 +10,8 @@ fn test_shared_hygiene() {
 
 #[test]
 fn test_repeat() {
-    const ROCKET_A: &'static str = "/a";
-    const ROCKET_B: &'static str = "/b";
+    const ROCKET_A: &str = "/a";
+    const ROCKET_B: &str = "/b";
 
     macro_rules! routes {
         ($($route:ident),*) => {{
@@ -27,7 +27,7 @@ fn test_repeat() {
 
 #[test]
 fn test_integer() {
-    const CONST0: &'static str = "const0";
+    const CONST0: &str = "const0";
 
     let pasted = paste!([<CONST 0>]);
     assert_eq!(pasted, CONST0);
diff --git a/tests/ui/case-warning.stderr b/tests/ui/case-warning.stderr
index d140c19..8309912 100644
--- a/tests/ui/case-warning.stderr
+++ b/tests/ui/case-warning.stderr
@@ -1,16 +1,16 @@
 error: function `fooBar` should have a snake case name
-  --> $DIR/case-warning.rs:8:20
+  --> tests/ui/case-warning.rs:8:20
    |
 8  |             pub fn [<foo $i>]() {}
    |                    ^^^^^^^^^^ help: convert the identifier to snake case: `foo_bar`
 ...
 13 | m!(Bar);
-   | -------- in this macro invocation
+   | ------- in this macro invocation
    |
 note: the lint level is defined here
-  --> $DIR/case-warning.rs:1:9
+  --> tests/ui/case-warning.rs:1:9
    |
 1  | #![deny(warnings)]
    |         ^^^^^^^^
    = note: `#[deny(non_snake_case)]` implied by `#[deny(warnings)]`
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/tests/ui/env-empty.stderr b/tests/ui/env-empty.stderr
index 3e4d4da..a1ef2e2 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:4:10
+ --> tests/ui/env-empty.rs:4:10
   |
 4 |     fn [<env!()>]() {}
   |          ^^^^^^
diff --git a/tests/ui/env-non-string.stderr b/tests/ui/env-non-string.stderr
index 7988800..05b8deb 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:4:15
+ --> tests/ui/env-non-string.rs:4:15
   |
 4 |     fn [<env!(1.31)>]() {}
   |               ^^^^
diff --git a/tests/ui/env-suffix.stderr b/tests/ui/env-suffix.stderr
index 82fad8b..d723cbc 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:4:15
+ --> tests/ui/env-suffix.rs:4:15
   |
 4 |     fn [<env!("VAR"suffix)>]() {}
   |               ^^^^^^^^^^^
diff --git a/tests/ui/env-unexpected.stderr b/tests/ui/env-unexpected.stderr
index 01bf722..25387b1 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:4:21
+ --> tests/ui/env-unexpected.rs:4:21
   |
 4 |     fn [<env!("VAR" "VAR")>]() {}
   |                     ^^^^^
diff --git a/tests/ui/invalid-ident.stderr b/tests/ui/invalid-ident.stderr
index 2c70cc8..8a233cb 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:4:8
+ --> tests/ui/invalid-ident.rs:4:8
   |
 4 |     fn [<0 f>]() {}
   |        ^^^^^^^
diff --git a/tests/ui/missing-paren-on-env.stderr b/tests/ui/missing-paren-on-env.stderr
index 64f0391..7b4bc46 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:4:15
+ --> tests/ui/missing-paren-on-env.rs:4:15
   |
 4 |     fn [<env! huh>]() {}
   |               ^^^
diff --git a/tests/ui/no-env-var.stderr b/tests/ui/no-env-var.stderr
index 9255a8f..60de9ed 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:4:17
+ --> tests/ui/no-env-var.rs:4:17
   |
 4 |     fn [<a env!("PASTE_UNKNOWN") b>]() {}
   |                 ^^^^^^^^^^^^^^^
diff --git a/tests/ui/no-ident-after-colon.stderr b/tests/ui/no-ident-after-colon.stderr
index 928316f..9db91eb 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:4:15
+ --> tests/ui/no-ident-after-colon.rs:4:15
   |
 4 |     fn [<name:0>]() {}
   |               ^
diff --git a/tests/ui/unexpected-group.stderr b/tests/ui/unexpected-group.stderr
index 4d05139..f66f5c1 100644
--- a/tests/ui/unexpected-group.stderr
+++ b/tests/ui/unexpected-group.stderr
@@ -1,5 +1,5 @@
 error: unexpected token
- --> $DIR/unexpected-group.rs:4:12
+ --> tests/ui/unexpected-group.rs:4:12
   |
 4 |     fn [<a {} b>]() {}
   |            ^^
diff --git a/tests/ui/unexpected-modifier.stderr b/tests/ui/unexpected-modifier.stderr
index 513835c..1eaba31 100644
--- a/tests/ui/unexpected-modifier.stderr
+++ b/tests/ui/unexpected-modifier.stderr
@@ -1,5 +1,5 @@
 error: unexpected modifier
- --> $DIR/unexpected-modifier.rs:4:10
+ --> tests/ui/unexpected-modifier.rs:4:10
   |
 4 |     fn [<:lower x>]() {}
   |          ^^^^^^
diff --git a/tests/ui/unexpected-punct.stderr b/tests/ui/unexpected-punct.stderr
index 456d172..1a74a61 100644
--- a/tests/ui/unexpected-punct.stderr
+++ b/tests/ui/unexpected-punct.stderr
@@ -1,5 +1,5 @@
 error: unexpected punct
- --> $DIR/unexpected-punct.rs:4:12
+ --> tests/ui/unexpected-punct.rs:4:12
   |
 4 |     fn [<a + b>]() {}
   |            ^
diff --git a/tests/ui/unsupported-literal.stderr b/tests/ui/unsupported-literal.stderr
index 0167999..842e2f2 100644
--- a/tests/ui/unsupported-literal.stderr
+++ b/tests/ui/unsupported-literal.stderr
@@ -1,5 +1,5 @@
 error: unsupported literal
- --> $DIR/unsupported-literal.rs:4:10
+ --> tests/ui/unsupported-literal.rs:4:10
   |
 4 |     fn [<1e+100>]() {}
   |          ^^^^^^
diff --git a/tests/ui/unsupported-modifier.stderr b/tests/ui/unsupported-modifier.stderr
index bfb9697..3c70435 100644
--- a/tests/ui/unsupported-modifier.stderr
+++ b/tests/ui/unsupported-modifier.stderr
@@ -1,5 +1,5 @@
 error: unsupported modifier
- --> $DIR/unsupported-modifier.rs:4:11
+ --> tests/ui/unsupported-modifier.rs:4:11
   |
 4 |     fn [<a:pillow>]() {}
   |           ^^^^^^^