mirror of
https://github.com/rust-lang/rust.git
synced 2025-10-10 22:34:01 +00:00

This reverts commit 1eeb8e8b151d1da7daa73837a25dc5f7a1a7fa28, reversing changes made to 324bf2b9fd8bf9661e7045c8a93f5ff0ec1a8ca5. Unfortunately the assert desugaring change is not backwards compatible, see RUST-145770. Code such as ```rust #[derive(Debug)] struct F { data: bool } impl std::ops::Not for F { type Output = bool; fn not(self) -> Self::Output { !self.data } } fn main() { let f = F { data: true }; assert!(f); } ``` would be broken by the assert desugaring change. We may need to land the change over an edition boundary, or limit the editions that the desugaring change impacts.
163 lines
5.3 KiB
Rust
163 lines
5.3 KiB
Rust
mod context;
|
|
|
|
use rustc_ast::token::Delimiter;
|
|
use rustc_ast::tokenstream::{DelimSpan, TokenStream};
|
|
use rustc_ast::{DelimArgs, Expr, ExprKind, MacCall, Path, PathSegment, UnOp, token};
|
|
use rustc_ast_pretty::pprust;
|
|
use rustc_errors::PResult;
|
|
use rustc_expand::base::{DummyResult, ExpandResult, ExtCtxt, MacEager, MacroExpanderResult};
|
|
use rustc_parse::exp;
|
|
use rustc_parse::parser::Parser;
|
|
use rustc_span::{DUMMY_SP, Ident, Span, Symbol, sym};
|
|
use thin_vec::thin_vec;
|
|
|
|
use crate::edition_panic::use_panic_2021;
|
|
use crate::errors;
|
|
|
|
pub(crate) fn expand_assert<'cx>(
|
|
cx: &'cx mut ExtCtxt<'_>,
|
|
span: Span,
|
|
tts: TokenStream,
|
|
) -> MacroExpanderResult<'cx> {
|
|
let Assert { cond_expr, custom_message } = match parse_assert(cx, span, tts) {
|
|
Ok(assert) => assert,
|
|
Err(err) => {
|
|
let guar = err.emit();
|
|
return ExpandResult::Ready(DummyResult::any(span, guar));
|
|
}
|
|
};
|
|
|
|
// `core::panic` and `std::panic` are different macros, so we use call-site
|
|
// context to pick up whichever is currently in scope.
|
|
let call_site_span = cx.with_call_site_ctxt(span);
|
|
|
|
let panic_path = || {
|
|
if use_panic_2021(span) {
|
|
// On edition 2021, we always call `$crate::panic::panic_2021!()`.
|
|
Path {
|
|
span: call_site_span,
|
|
segments: cx
|
|
.std_path(&[sym::panic, sym::panic_2021])
|
|
.into_iter()
|
|
.map(|ident| PathSegment::from_ident(ident))
|
|
.collect(),
|
|
tokens: None,
|
|
}
|
|
} else {
|
|
// Before edition 2021, we call `panic!()` unqualified,
|
|
// such that it calls either `std::panic!()` or `core::panic!()`.
|
|
Path::from_ident(Ident::new(sym::panic, call_site_span))
|
|
}
|
|
};
|
|
|
|
// Simply uses the user provided message instead of generating custom outputs
|
|
let expr = if let Some(tokens) = custom_message {
|
|
let then = cx.expr(
|
|
call_site_span,
|
|
ExprKind::MacCall(Box::new(MacCall {
|
|
path: panic_path(),
|
|
args: Box::new(DelimArgs {
|
|
dspan: DelimSpan::from_single(call_site_span),
|
|
delim: Delimiter::Parenthesis,
|
|
tokens,
|
|
}),
|
|
})),
|
|
);
|
|
expr_if_not(cx, call_site_span, cond_expr, then, None)
|
|
}
|
|
// If `generic_assert` is enabled, generates rich captured outputs
|
|
//
|
|
// FIXME(c410-f3r) See https://github.com/rust-lang/rust/issues/96949
|
|
else if cx.ecfg.features.generic_assert() {
|
|
context::Context::new(cx, call_site_span).build(cond_expr, panic_path())
|
|
}
|
|
// If `generic_assert` is not enabled, only outputs a literal "assertion failed: ..."
|
|
// string
|
|
else {
|
|
// Pass our own message directly to $crate::panicking::panic(),
|
|
// because it might contain `{` and `}` that should always be
|
|
// passed literally.
|
|
let then = cx.expr_call_global(
|
|
call_site_span,
|
|
cx.std_path(&[sym::panicking, sym::panic]),
|
|
thin_vec![cx.expr_str(
|
|
DUMMY_SP,
|
|
Symbol::intern(&format!(
|
|
"assertion failed: {}",
|
|
pprust::expr_to_string(&cond_expr)
|
|
)),
|
|
)],
|
|
);
|
|
expr_if_not(cx, call_site_span, cond_expr, then, None)
|
|
};
|
|
|
|
ExpandResult::Ready(MacEager::expr(expr))
|
|
}
|
|
|
|
struct Assert {
|
|
cond_expr: Box<Expr>,
|
|
custom_message: Option<TokenStream>,
|
|
}
|
|
|
|
// if !{ ... } { ... } else { ... }
|
|
fn expr_if_not(
|
|
cx: &ExtCtxt<'_>,
|
|
span: Span,
|
|
cond: Box<Expr>,
|
|
then: Box<Expr>,
|
|
els: Option<Box<Expr>>,
|
|
) -> Box<Expr> {
|
|
cx.expr_if(span, cx.expr(span, ExprKind::Unary(UnOp::Not, cond)), then, els)
|
|
}
|
|
|
|
fn parse_assert<'a>(cx: &ExtCtxt<'a>, sp: Span, stream: TokenStream) -> PResult<'a, Assert> {
|
|
let mut parser = cx.new_parser_from_tts(stream);
|
|
|
|
if parser.token == token::Eof {
|
|
return Err(cx.dcx().create_err(errors::AssertRequiresBoolean { span: sp }));
|
|
}
|
|
|
|
let cond_expr = parser.parse_expr()?;
|
|
|
|
// Some crates use the `assert!` macro in the following form (note extra semicolon):
|
|
//
|
|
// assert!(
|
|
// my_function();
|
|
// );
|
|
//
|
|
// Emit an error about semicolon and suggest removing it.
|
|
if parser.token == token::Semi {
|
|
cx.dcx().emit_err(errors::AssertRequiresExpression { span: sp, token: parser.token.span });
|
|
parser.bump();
|
|
}
|
|
|
|
// Some crates use the `assert!` macro in the following form (note missing comma before
|
|
// message):
|
|
//
|
|
// assert!(true "error message");
|
|
//
|
|
// Emit an error and suggest inserting a comma.
|
|
let custom_message =
|
|
if let token::Literal(token::Lit { kind: token::Str, .. }) = parser.token.kind {
|
|
let comma = parser.prev_token.span.shrink_to_hi();
|
|
cx.dcx().emit_err(errors::AssertMissingComma { span: parser.token.span, comma });
|
|
|
|
parse_custom_message(&mut parser)
|
|
} else if parser.eat(exp!(Comma)) {
|
|
parse_custom_message(&mut parser)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
if parser.token != token::Eof {
|
|
parser.unexpected()?;
|
|
}
|
|
|
|
Ok(Assert { cond_expr, custom_message })
|
|
}
|
|
|
|
fn parse_custom_message(parser: &mut Parser<'_>) -> Option<TokenStream> {
|
|
let ts = parser.parse_tokens();
|
|
if !ts.is_empty() { Some(ts) } else { None }
|
|
}
|