-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #91692 - matthiaskrgr:rollup-u7dvh0n, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #87599 (Implement concat_bytes!) - #89999 (Update std::env::temp_dir to use GetTempPath2 on Windows when available.) - #90796 (Remove the reg_thumb register class for asm! on ARM) - #91042 (Use Vec extend instead of repeated pushes on several places) - #91634 (Do not attempt to suggest help for overly malformed struct/function call) - #91685 (Install llvm tools to sysroot when assembling local toolchain) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
26 changed files
with
542 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| use rustc_ast as ast; | ||
| use rustc_ast::{ptr::P, tokenstream::TokenStream}; | ||
| use rustc_data_structures::sync::Lrc; | ||
| use rustc_errors::Applicability; | ||
| use rustc_expand::base::{self, DummyResult}; | ||
|
|
||
| /// Emits errors for literal expressions that are invalid inside and outside of an array. | ||
| fn invalid_type_err(cx: &mut base::ExtCtxt<'_>, expr: &P<rustc_ast::Expr>, is_nested: bool) { | ||
| let lit = if let ast::ExprKind::Lit(lit) = &expr.kind { | ||
| lit | ||
| } else { | ||
| unreachable!(); | ||
| }; | ||
| match lit.kind { | ||
| ast::LitKind::Char(_) => { | ||
| let mut err = cx.struct_span_err(expr.span, "cannot concatenate character literals"); | ||
| if let Ok(snippet) = cx.sess.source_map().span_to_snippet(expr.span) { | ||
| err.span_suggestion( | ||
| expr.span, | ||
| "try using a byte character", | ||
| format!("b{}", snippet), | ||
| Applicability::MachineApplicable, | ||
| ) | ||
| .emit(); | ||
| } | ||
| } | ||
| ast::LitKind::Str(_, _) => { | ||
| let mut err = cx.struct_span_err(expr.span, "cannot concatenate string literals"); | ||
| // suggestion would be invalid if we are nested | ||
| if !is_nested { | ||
| if let Ok(snippet) = cx.sess.source_map().span_to_snippet(expr.span) { | ||
| err.span_suggestion( | ||
| expr.span, | ||
| "try using a byte string", | ||
| format!("b{}", snippet), | ||
| Applicability::MachineApplicable, | ||
| ); | ||
| } | ||
| } | ||
| err.emit(); | ||
| } | ||
| ast::LitKind::Float(_, _) => { | ||
| cx.span_err(expr.span, "cannot concatenate float literals"); | ||
| } | ||
| ast::LitKind::Bool(_) => { | ||
| cx.span_err(expr.span, "cannot concatenate boolean literals"); | ||
| } | ||
| ast::LitKind::Err(_) => {} | ||
| ast::LitKind::Int(_, _) if !is_nested => { | ||
| let mut err = cx.struct_span_err(expr.span, "cannot concatenate numeric literals"); | ||
| if let Ok(snippet) = cx.sess.source_map().span_to_snippet(expr.span) { | ||
| err.span_suggestion( | ||
| expr.span, | ||
| "try wrapping the number in an array", | ||
| format!("[{}]", snippet), | ||
| Applicability::MachineApplicable, | ||
| ); | ||
| } | ||
| err.emit(); | ||
| } | ||
| ast::LitKind::Int( | ||
| val, | ||
| ast::LitIntType::Unsuffixed | ast::LitIntType::Unsigned(ast::UintTy::U8), | ||
| ) => { | ||
| assert!(val > u8::MAX.into()); // must be an error | ||
| cx.span_err(expr.span, "numeric literal is out of bounds"); | ||
| } | ||
| ast::LitKind::Int(_, _) => { | ||
| cx.span_err(expr.span, "numeric literal is not a `u8`"); | ||
| } | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
|
|
||
| pub fn expand_concat_bytes( | ||
| cx: &mut base::ExtCtxt<'_>, | ||
| sp: rustc_span::Span, | ||
| tts: TokenStream, | ||
| ) -> Box<dyn base::MacResult + 'static> { | ||
| let es = match base::get_exprs_from_tts(cx, sp, tts) { | ||
| Some(e) => e, | ||
| None => return DummyResult::any(sp), | ||
| }; | ||
| let mut accumulator = Vec::new(); | ||
| let mut missing_literals = vec![]; | ||
| let mut has_errors = false; | ||
| for e in es { | ||
| match e.kind { | ||
| ast::ExprKind::Array(ref exprs) => { | ||
| for expr in exprs { | ||
| match expr.kind { | ||
| ast::ExprKind::Array(_) => { | ||
| if !has_errors { | ||
| cx.span_err(expr.span, "cannot concatenate doubly nested array"); | ||
| } | ||
| has_errors = true; | ||
| } | ||
| ast::ExprKind::Lit(ref lit) => match lit.kind { | ||
| ast::LitKind::Int( | ||
| val, | ||
| ast::LitIntType::Unsuffixed | ||
| | ast::LitIntType::Unsigned(ast::UintTy::U8), | ||
| ) if val <= u8::MAX.into() => { | ||
| accumulator.push(val as u8); | ||
| } | ||
|
|
||
| ast::LitKind::Byte(val) => { | ||
| accumulator.push(val); | ||
| } | ||
| ast::LitKind::ByteStr(_) => { | ||
| if !has_errors { | ||
| cx.struct_span_err( | ||
| expr.span, | ||
| "cannot concatenate doubly nested array", | ||
| ) | ||
| .note("byte strings are treated as arrays of bytes") | ||
| .help("try flattening the array") | ||
| .emit(); | ||
| } | ||
| has_errors = true; | ||
| } | ||
| _ => { | ||
| if !has_errors { | ||
| invalid_type_err(cx, expr, true); | ||
| } | ||
| has_errors = true; | ||
| } | ||
| }, | ||
| _ => { | ||
| missing_literals.push(expr.span); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ast::ExprKind::Lit(ref lit) => match lit.kind { | ||
| ast::LitKind::Byte(val) => { | ||
| accumulator.push(val); | ||
| } | ||
| ast::LitKind::ByteStr(ref bytes) => { | ||
| accumulator.extend_from_slice(&bytes); | ||
| } | ||
| _ => { | ||
| if !has_errors { | ||
| invalid_type_err(cx, &e, false); | ||
| } | ||
| has_errors = true; | ||
| } | ||
| }, | ||
| ast::ExprKind::Err => { | ||
| has_errors = true; | ||
| } | ||
| _ => { | ||
| missing_literals.push(e.span); | ||
| } | ||
| } | ||
| } | ||
| if !missing_literals.is_empty() { | ||
| let mut err = cx.struct_span_err(missing_literals.clone(), "expected a byte literal"); | ||
| err.note("only byte literals (like `b\"foo\"`, `b's'`, and `[3, 4, 5]`) can be passed to `concat_bytes!()`"); | ||
| err.emit(); | ||
| return base::MacEager::expr(DummyResult::raw_expr(sp, true)); | ||
| } else if has_errors { | ||
| return base::MacEager::expr(DummyResult::raw_expr(sp, true)); | ||
| } | ||
| let sp = cx.with_def_site_ctxt(sp); | ||
| base::MacEager::expr(cx.expr_lit(sp, ast::LitKind::ByteStr(Lrc::from(accumulator)))) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.