nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate redundant .parse_sess in rustc_attr::builtin errors

Browse Source
This commit is contained in:
David Tolnay 2023-10-22 12:39:08 -07:00
parent f5429a0186
commit 28785291f9
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
compiler/rustc_attr/src/builtin.rs
View File

@ -200,8 +200,7 @@ pub fn find_stability(
sym::rustc_allowed_through_unstable_modules => allowed_through_unstable_modules = true, sym::rustc_allowed_through_unstable_modules => allowed_through_unstable_modules = true,
sym::unstable => { sym::unstable => {
if stab.is_some() { if stab.is_some() {
sess.parse_sess sess.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
break; break;
} }
@ -211,8 +210,7 @@ pub fn find_stability(
} }
sym::stable => { sym::stable => {
if stab.is_some() { if stab.is_some() {
sess.parse_sess sess.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
break; break;
} }
if let Some((feature, level)) = parse_stability(sess, attr) { if let Some((feature, level)) = parse_stability(sess, attr) {
@ -256,8 +254,7 @@ pub fn find_const_stability(
sym::rustc_promotable => promotable = true, sym::rustc_promotable => promotable = true,
sym::rustc_const_unstable => { sym::rustc_const_unstable => {
if const_stab.is_some() { if const_stab.is_some() {
sess.parse_sess sess.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
break; break;
} }
@ -268,8 +265,7 @@ pub fn find_const_stability(
} }
sym::rustc_const_stable => { sym::rustc_const_stable => {
if const_stab.is_some() { if const_stab.is_some() {
sess.parse_sess sess.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
break; break;
} }
if let Some((feature, level)) = parse_stability(sess, attr) { if let Some((feature, level)) = parse_stability(sess, attr) {
@ -303,8 +299,7 @@ pub fn find_body_stability(
for attr in attrs { for attr in attrs {
if attr.has_name(sym::rustc_default_body_unstable) { if attr.has_name(sym::rustc_default_body_unstable) {
if body_stab.is_some() { if body_stab.is_some() {
sess.parse_sess sess.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
.emit_err(session_diagnostics::MultipleStabilityLevels { span: attr.span });
break; break;
} }
@ -319,7 +314,7 @@ pub fn find_body_stability(
fn insert_or_error(sess: &Session, meta: &MetaItem, item: &mut Option<Symbol>) -> Option<()> { fn insert_or_error(sess: &Session, meta: &MetaItem, item: &mut Option<Symbol>) -> Option<()> {
if item.is_some() { if item.is_some() {
sess.parse_sess.emit_err(session_diagnostics::MultipleItem { sess.emit_err(session_diagnostics::MultipleItem {
span: meta.span, span: meta.span,
item: pprust::path_to_string(&meta.path), item: pprust::path_to_string(&meta.path),
}); });
@ -343,11 +338,11 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
let mut since = None; let mut since = None;
for meta in metas { for meta in metas {
let Some(mi) = meta.meta_item() else { let Some(mi) = meta.meta_item() else {
sess.parse_sess.emit_err(session_diagnostics::UnsupportedLiteral { sess.emit_err(session_diagnostics::UnsupportedLiteral {
span: meta.span(), span: meta.span(),
reason: UnsupportedLiteralReason::Generic, reason: UnsupportedLiteralReason::Generic,
is_bytestr: false, is_bytestr: false,
start_point_span: sess.parse_sess.source_map().start_point(meta.span()), start_point_span: sess.source_map().start_point(meta.span()),
}); });
return None; return None;
}; };
@ -356,7 +351,7 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
sym::feature => insert_or_error(sess, mi, &mut feature)?, sym::feature => insert_or_error(sess, mi, &mut feature)?,
sym::since => insert_or_error(sess, mi, &mut since)?, sym::since => insert_or_error(sess, mi, &mut since)?,
_ => { _ => {
sess.parse_sess.emit_err(session_diagnostics::UnknownMetaItem { sess.emit_err(session_diagnostics::UnknownMetaItem {
span: meta.span(), span: meta.span(),
item: pprust::path_to_string(&mi.path), item: pprust::path_to_string(&mi.path),
expected: &["feature", "since"], expected: &["feature", "since"],
@ -378,11 +373,11 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
Some((feature, level)) Some((feature, level))
} }
(None, _) => { (None, _) => {
sess.parse_sess.emit_err(session_diagnostics::MissingFeature { span: attr.span }); sess.emit_err(session_diagnostics::MissingFeature { span: attr.span });
None None
} }
_ => { _ => {
sess.parse_sess.emit_err(session_diagnostics::MissingSince { span: attr.span }); sess.emit_err(session_diagnostics::MissingSince { span: attr.span });
None None
} }
} }
@ -402,11 +397,11 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
let mut implied_by = None; let mut implied_by = None;
for meta in metas { for meta in metas {
let Some(mi) = meta.meta_item() else { let Some(mi) = meta.meta_item() else {
sess.parse_sess.emit_err(session_diagnostics::UnsupportedLiteral { sess.emit_err(session_diagnostics::UnsupportedLiteral {
span: meta.span(), span: meta.span(),
reason: UnsupportedLiteralReason::Generic, reason: UnsupportedLiteralReason::Generic,
is_bytestr: false, is_bytestr: false,
start_point_span: sess.parse_sess.source_map().start_point(meta.span()), start_point_span: sess.source_map().start_point(meta.span()),
}); });
return None; return None;
}; };
@ -446,7 +441,7 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
} }
sym::implied_by => insert_or_error(sess, mi, &mut implied_by)?, sym::implied_by => insert_or_error(sess, mi, &mut implied_by)?,
_ => { _ => {
sess.parse_sess.emit_err(session_diagnostics::UnknownMetaItem { sess.emit_err(session_diagnostics::UnknownMetaItem {
span: meta.span(), span: meta.span(),
item: pprust::path_to_string(&mi.path), item: pprust::path_to_string(&mi.path),
expected: &["feature", "reason", "issue", "soft", "implied_by"], expected: &["feature", "reason", "issue", "soft", "implied_by"],
@ -459,7 +454,7 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
match (feature, reason, issue) { match (feature, reason, issue) {
(Some(feature), reason, Some(_)) => { (Some(feature), reason, Some(_)) => {
if !rustc_lexer::is_ident(feature.as_str()) { if !rustc_lexer::is_ident(feature.as_str()) {
sess.parse_sess.emit_err(session_diagnostics::NonIdentFeature { span: attr.span }); sess.emit_err(session_diagnostics::NonIdentFeature { span: attr.span });
return None; return None;
} }
let level = StabilityLevel::Unstable { let level = StabilityLevel::Unstable {
@ -471,7 +466,7 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
Some((feature, level)) Some((feature, level))
} }
(None, _, _) => { (None, _, _) => {
sess.parse_sess.emit_err(session_diagnostics::MissingFeature { span: attr.span }); sess.emit_err(session_diagnostics::MissingFeature { span: attr.span });
return None; return None;
} }
_ => { _ => {
@ -753,7 +748,7 @@ pub fn find_deprecation(
MetaItemKind::List(list) => { MetaItemKind::List(list) => {
let get = |meta: &MetaItem, item: &mut Option<Symbol>| { let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
if item.is_some() { if item.is_some() {
sess.parse_sess.emit_err(session_diagnostics::MultipleItem { sess.emit_err(session_diagnostics::MultipleItem {
span: meta.span, span: meta.span,
item: pprust::path_to_string(&meta.path), item: pprust::path_to_string(&meta.path),
}); });
@ -764,14 +759,11 @@ pub fn find_deprecation(
true true
} else { } else {
if let Some(lit) = meta.name_value_literal() { if let Some(lit) = meta.name_value_literal() {
sess.parse_sess.emit_err(session_diagnostics::UnsupportedLiteral { sess.emit_err(session_diagnostics::UnsupportedLiteral {
span: lit.span, span: lit.span,
reason: UnsupportedLiteralReason::DeprecatedString, reason: UnsupportedLiteralReason::DeprecatedString,
is_bytestr: lit.kind.is_bytestr(), is_bytestr: lit.kind.is_bytestr(),
start_point_span: sess start_point_span: sess.source_map().start_point(lit.span),
.parse_sess
.source_map()
.start_point(lit.span),
}); });
} else { } else {
sess.emit_err(session_diagnostics::IncorrectMetaItem { sess.emit_err(session_diagnostics::IncorrectMetaItem {
@ -810,7 +802,7 @@ pub fn find_deprecation(
} }
} }
_ => { _ => {
sess.parse_sess.emit_err(session_diagnostics::UnknownMetaItem { sess.emit_err(session_diagnostics::UnknownMetaItem {
span: meta.span(), span: meta.span(),
item: pprust::path_to_string(&mi.path), item: pprust::path_to_string(&mi.path),
expected: if features.deprecated_suggestion { expected: if features.deprecated_suggestion {
@ -823,14 +815,11 @@ pub fn find_deprecation(
} }
}, },
NestedMetaItem::Lit(lit) => { NestedMetaItem::Lit(lit) => {
sess.parse_sess.emit_err(session_diagnostics::UnsupportedLiteral { sess.emit_err(session_diagnostics::UnsupportedLiteral {
span: lit.span, span: lit.span,
reason: UnsupportedLiteralReason::DeprecatedKvPair, reason: UnsupportedLiteralReason::DeprecatedKvPair,
is_bytestr: false, is_bytestr: false,
start_point_span: sess start_point_span: sess.source_map().start_point(lit.span),
.parse_sess
.source_map()
.start_point(lit.span),
}); });
continue 'outer; continue 'outer;
} }
@ -841,7 +830,7 @@ pub fn find_deprecation(
if is_rustc { if is_rustc {
if since.is_none() { if since.is_none() {
sess.parse_sess.emit_err(session_diagnostics::MissingSince { span: attr.span }); sess.emit_err(session_diagnostics::MissingSince { span: attr.span });
continue; continue;
} }