mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a FIXME, by adding a gate_multi macro.

Browse Source 
Note that this adds the `span.allows_unstable` checking that this case
previously lacked.
This commit is contained in:
Nicholas Nethercote 2023-10-30 10:33:24 +11:00
parent de17ec9dae
commit 499b3098f8
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/rustc_ast_passes/src/feature_gate.rs
View File

@ -30,7 +30,7 @@ macro_rules! gate {
} }
/// The unusual case, where the `has_feature` condition is non-standard. /// The unusual case, where the `has_feature` condition is non-standard.
macro_rules! gate_alt { macro_rules! gate_complex {
($visitor:expr, $has_feature:expr, $name:expr, $span:expr, $explain:expr) => {{ ($visitor:expr, $has_feature:expr, $name:expr, $span:expr, $explain:expr) => {{
if !$has_feature && !$span.allows_unstable($name) { if !$has_feature && !$span.allows_unstable($name) {
feature_err(&$visitor.sess.parse_sess, $name, $span, $explain).emit(); feature_err(&$visitor.sess.parse_sess, $name, $span, $explain).emit();
@ -38,6 +38,19 @@ macro_rules! gate_alt {
}}; }};
} }
/// The case involving a multispan.
macro_rules! gate_multi {
($visitor:expr, $feature:ident, $spans:expr, $explain:expr) => {{
if !$visitor.features.$feature {
let spans: Vec<_> =
$spans.filter(|span| !span.allows_unstable(sym::$feature)).collect();
if !spans.is_empty() {
feature_err(&$visitor.sess.parse_sess, sym::$feature, spans, $explain).emit();
}
}
}};
}
/// The legacy case. /// The legacy case.
macro_rules! gate_legacy { macro_rules! gate_legacy {
($visitor:expr, $feature:ident, $span:expr, $explain:expr) => {{ ($visitor:expr, $feature:ident, $span:expr, $explain:expr) => {{
@ -141,23 +154,16 @@ impl<'a> PostExpansionVisitor<'a> {
fn check_late_bound_lifetime_defs(&self, params: &[ast::GenericParam]) { fn check_late_bound_lifetime_defs(&self, params: &[ast::GenericParam]) {
// Check only lifetime parameters are present and that the lifetime // Check only lifetime parameters are present and that the lifetime
// parameters that are present have no bounds. // parameters that are present have no bounds.
let non_lt_param_spans: Vec<_> = params let non_lt_param_spans = params.iter().filter_map(|param| match param.kind {
.iter() ast::GenericParamKind::Lifetime { .. } => None,
.filter_map(|param| match param.kind { _ => Some(param.ident.span),
ast::GenericParamKind::Lifetime { .. } => None, });
_ => Some(param.ident.span), gate_multi!(
}) &self,
.collect(); non_lifetime_binders,
// FIXME: gate_feature_post doesn't really handle multispans... non_lt_param_spans,
if !non_lt_param_spans.is_empty() && !self.features.non_lifetime_binders { crate::fluent_generated::ast_passes_forbidden_non_lifetime_param
feature_err( );
&self.sess.parse_sess,
sym::non_lifetime_binders,
non_lt_param_spans,
crate::fluent_generated::ast_passes_forbidden_non_lifetime_param,
)
.emit();
}
for param in params { for param in params {
if !param.bounds.is_empty() { if !param.bounds.is_empty() {
let spans: Vec<_> = param.bounds.iter().map(|b| b.span()).collect(); let spans: Vec<_> = param.bounds.iter().map(|b| b.span()).collect();