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

Rustup to https://github.com/rust-lang/rust/pull/60965

https://github.com/rust-lang/rust/pull/60965
This commit is contained in:
bors 2019-05-23 18:23:39 +00:00
commit c984f77097
2 changed files with 5 additions and 5 deletions

View file

@ -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;
},

View file

@ -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;