Auto merge of #4131 - phansch:rustup2, r=phansch

Rustup to rust-lang/rust#60965 rust-lang/rust#60965
rust-lang · May 23, 2019 · c984f77 · c984f77
2 parents 9c85b02 + a316179
commit c984f77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs
@@ -274,10 +274,10 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &TokenStream, is_write: bool) -> (O
     let mut is_raw = false;
     if let TokenStream(Some(tokens)) = &tts {
         for token in tokens.iter() {
-            if let (TokenTree::Token(_, token::Token::Literal(lit, _)), _) = token {
-                match lit {
-                    token::Lit::Str_(_) => break,
-                    token::Lit::StrRaw(_, _) => {
+            if let (TokenTree::Token(_, token::Token::Literal(lit)), _) = token {
+                match lit.kind {
+                    token::Str => break,
+                    token::StrRaw(_) => {
                         is_raw = true;
                         break;
                     },

diff --git a/tests/ui/crashes/ice-3891.stderr b/tests/ui/crashes/ice-3891.stderr
@@ -1,4 +1,4 @@
-error: invalid suffix `x` for numeric literal
+error: invalid suffix `x` for integer literal
   --> $DIR/ice-3891.rs:2:5
    |
 LL |     1x;