From 2af47facc3fd7eda3fb4e52f0589bb6f48eff15c Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Fri, 7 Jun 2019 12:53:33 +0300 Subject: syntax: Treat error literals in more principled way --- src/libsyntax_ext/concat.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libsyntax_ext') diff --git a/src/libsyntax_ext/concat.rs b/src/libsyntax_ext/concat.rs index 230b00c0f8f..68d5178372e 100644 --- a/src/libsyntax_ext/concat.rs +++ b/src/libsyntax_ext/concat.rs @@ -22,7 +22,6 @@ pub fn expand_syntax_ext( match e.node { ast::ExprKind::Lit(ref lit) => match lit.node { ast::LitKind::Str(ref s, _) - | ast::LitKind::Err(ref s) | ast::LitKind::Float(ref s, _) | ast::LitKind::FloatUnsuffixed(ref s) => { accumulator.push_str(&s.as_str()); @@ -41,6 +40,9 @@ pub fn expand_syntax_ext( ast::LitKind::Byte(..) | ast::LitKind::ByteStr(..) => { cx.span_err(e.span, "cannot concatenate a byte string literal"); } + ast::LitKind::Err(_) => { + has_errors = true; + } }, ast::ExprKind::Err => { has_errors = true; -- cgit 1.4.1-3-g733a5