Clarify error message about arguments

dtolnay · dtolnay · commit 62b52ee80cdb · 2018-04-29T21:22:47.000-07:00
diff --git a/impl/src/lib.rs b/impl/src/lib.rs
@@ -55,7 +55,7 @@ where
     let len = source.clone().into_iter().count();
     if len != 1 {
         panic!(
-            "argument must be a single string literal, but got {} arguments",
+            "argument must be a single string literal, but got {} tokens",
             len
         );
     }
diff --git a/tests/tests/ui-stable/no-arguments.stderr b/tests/tests/ui-stable/no-arguments.stderr
@@ -4,7 +4,7 @@ error: proc-macro derive panicked
 13 |     indoc!();
    |     ^^^^^^^^^
    |
-   = help: message: argument must be a single string literal, but got 0 arguments
+   = help: message: argument must be a single string literal, but got 0 tokens
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/tests/tests/ui-stable/two-arguments.stderr b/tests/tests/ui-stable/two-arguments.stderr
@@ -8,7 +8,7 @@ error: proc-macro derive panicked
 17 | |         " 64);
    | |______________^
    |
-   = help: message: argument must be a single string literal, but got 2 arguments
+   = help: message: argument must be a single string literal, but got 2 tokens
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/tests/tests/ui-unstable/no-arguments.stderr b/tests/tests/ui-unstable/no-arguments.stderr
@@ -4,7 +4,7 @@ error: proc macro panicked
 15 |     indoc!();
    |     ^^^^^^^^^
    |
-   = help: message: argument must be a single string literal, but got 0 arguments
+   = help: message: argument must be a single string literal, but got 0 tokens
 
 error: aborting due to previous error
 
diff --git a/tests/tests/ui-unstable/two-arguments.stderr b/tests/tests/ui-unstable/two-arguments.stderr
@@ -8,7 +8,7 @@ error: proc macro panicked
 19 | |         " 64);
    | |______________^
    |
-   = help: message: argument must be a single string literal, but got 2 arguments
+   = help: message: argument must be a single string literal, but got 2 tokens
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ where`
`55`	`55`	`let len = source.clone().into_iter().count();`
`56`	`56`	`if len != 1 {`
`57`	`57`	`panic!(`
`58`		`- "argument must be a single string literal, but got {} arguments",`
	`58`	`+ "argument must be a single string literal, but got {} tokens",`
`59`	`59`	`len`
`60`	`60`	`);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: proc-macro derive panicked`
`4`	`4`	`13 \| indoc!();`
`5`	`5`	`\| ^^^^^^^^^`
`6`	`6`	`\|`
`7`		`- = help: message: argument must be a single string literal, but got 0 arguments`
	`7`	`+ = help: message: argument must be a single string literal, but got 0 tokens`
`8`	`8`	`= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)`
`9`	`9`
`10`	`10`	`error: aborting due to previous error`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ error: proc-macro derive panicked`
`8`	`8`	`17 \| \| " 64);`
`9`	`9`	`\| \|______________^`
`10`	`10`	`\|`
`11`		`- = help: message: argument must be a single string literal, but got 2 arguments`
	`11`	`+ = help: message: argument must be a single string literal, but got 2 tokens`
`12`	`12`	`= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)`
`13`	`13`
`14`	`14`	`error: aborting due to previous error`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ error: proc macro panicked`
`4`	`4`	`15 \| indoc!();`
`5`	`5`	`\| ^^^^^^^^^`
`6`	`6`	`\|`
`7`		`- = help: message: argument must be a single string literal, but got 0 arguments`
	`7`	`+ = help: message: argument must be a single string literal, but got 0 tokens`
`8`	`8`
`9`	`9`	`error: aborting due to previous error`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ error: proc macro panicked`
`8`	`8`	`19 \| \| " 64);`
`9`	`9`	`\| \|______________^`
`10`	`10`	`\|`
`11`		`- = help: message: argument must be a single string literal, but got 2 arguments`
	`11`	`+ = help: message: argument must be a single string literal, but got 2 tokens`
`12`	`12`
`13`	`13`	`error: aborting due to previous error`
`14`	`14`