bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve span of env-related errors

Browse source
This commit is contained in:
David Tolnay 2023-10-25 13:52:38 -07:00
parent 1078250f48
commit 5563a9ba3d
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_macros/src/symbols.rs
View file

@ -26,7 +26,7 @@ use proc_macro2::{Span, TokenStream};
use quote::quote; use quote::quote;
use std::collections::HashMap; use std::collections::HashMap;
use syn::parse::{Parse, ParseStream, Result}; use syn::parse::{Parse, ParseStream, Result};
use syn::{braced, punctuated::Punctuated, Expr, Ident, Lit, LitStr, Token}; use syn::{braced, punctuated::Punctuated, Expr, Ident, Lit, LitStr, Macro, Token};
#[cfg(test)] #[cfg(test)]
mod tests; mod tests;
@ -59,7 +59,7 @@ struct Symbol {
enum Value { enum Value {
SameAsName, SameAsName,
String(LitStr), String(LitStr),
Env(LitStr), Env(LitStr, Macro),
Unsupported(Expr), Unsupported(Expr),
} }
@ -84,7 +84,7 @@ impl Parse for Value {
} }
Expr::Macro(expr) => { Expr::Macro(expr) => {
if expr.mac.path.is_ident("env") && let Ok(lit) = expr.mac.parse_body() { if expr.mac.path.is_ident("env") && let Ok(lit) = expr.mac.parse_body() {
return Ok(Value::Env(lit)); return Ok(Value::Env(lit, expr.mac.clone()));
} }
} }
_ => {} _ => {}
@ -218,7 +218,7 @@ fn symbols_with_errors(input: TokenStream) -> (TokenStream, Vec<syn::Error>) {
let value = match &symbol.value { let value = match &symbol.value {
Value::SameAsName => name.to_string(), Value::SameAsName => name.to_string(),
Value::String(lit) => lit.value(), Value::String(lit) => lit.value(),
Value::Env(_) => continue, // in another loop below Value::Env(..) => continue, // in another loop below
Value::Unsupported(expr) => { Value::Unsupported(expr) => {
errors.list.push(syn::Error::new_spanned( errors.list.push(syn::Error::new_spanned(
expr, expr,
@ -252,15 +252,15 @@ fn symbols_with_errors(input: TokenStream) -> (TokenStream, Vec<syn::Error>) {
// Symbols whose value comes from an environment variable. It's allowed for // Symbols whose value comes from an environment variable. It's allowed for
// these to have the same value as another symbol. // these to have the same value as another symbol.
for symbol in &input.symbols { for symbol in &input.symbols {
let env_var = match &symbol.value { let (env_var, expr) = match &symbol.value {
Value::Env(lit) => lit, Value::Env(lit, expr) => (lit, expr),
Value::SameAsName | Value::String(_) | Value::Unsupported(_) => continue, Value::SameAsName | Value::String(_) | Value::Unsupported(_) => continue,
}; };
let value = match proc_macro::tracked_env::var(env_var.value()) { let value = match proc_macro::tracked_env::var(env_var.value()) {
Ok(value) => value, Ok(value) => value,
Err(err) => { Err(err) => {
errors.error(symbol.name.span(), err.to_string()); errors.list.push(syn::Error::new_spanned(expr, err));
continue; continue;
} }
}; };