mirror of
https://github.com/rust-lang/rust.git
synced 2025-10-27 11:05:06 +00:00
d50a8d5fb3
- Show the `#![ ... ]` in the span (to make it clear that it should not be included in the CLI argument) - Show more detailed errors when the crate has valid token trees but invalid syntax. Previously, `crate-attr=feature(foo),feature(bar)` would just say "invalid crate attribute" and point at the comma. Now, it explicitly says that the comma was unexpected, which is useful when using `--error-format=short`. It also fixes the column to show the correct span. - Recover from parse errors. Previously we would abort immediately on syntax errors; now we go on to try and type-check the rest of the crate. The new diagnostic code also happens to be slightly shorter.
38 lines
1.1 KiB
Rust
38 lines
1.1 KiB
Rust
//! Attributes injected into the crate root from command line using `-Z crate-attr`.
|
|
|
|
use rustc_ast::{self as ast};
|
|
use rustc_errors::Diag;
|
|
use rustc_parse::parser::attr::InnerAttrPolicy;
|
|
use rustc_parse::{parse_in, source_str_to_stream};
|
|
use rustc_session::parse::ParseSess;
|
|
use rustc_span::FileName;
|
|
|
|
pub fn inject(krate: &mut ast::Crate, psess: &ParseSess, attrs: &[String]) {
|
|
for raw_attr in attrs {
|
|
let source = format!("#![{raw_attr}]");
|
|
let parse = || -> Result<ast::Attribute, Vec<Diag<'_>>> {
|
|
let tokens = source_str_to_stream(
|
|
psess,
|
|
FileName::cli_crate_attr_source_code(raw_attr),
|
|
source,
|
|
None,
|
|
)?;
|
|
parse_in(psess, tokens, "<crate attribute>", |p| {
|
|
p.parse_attribute(InnerAttrPolicy::Permitted)
|
|
})
|
|
.map_err(|e| vec![e])
|
|
};
|
|
let meta = match parse() {
|
|
Ok(meta) => meta,
|
|
Err(errs) => {
|
|
for err in errs {
|
|
err.emit();
|
|
}
|
|
continue;
|
|
}
|
|
};
|
|
|
|
krate.attrs.push(meta);
|
|
}
|
|
}
|