user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ParamKindOrd::ConstUnordered variant

Browse source
This commit is contained in:
kadmin 2020-08-05 22:36:47 +00:00
parent 319c4f45e0
commit 1ae1a6332c
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_ast/ast.rs
View file

@ -314,6 +314,7 @@ pub enum ParamKindOrd {
Lifetime,
Type,
Const,
ConstUnordered,
}
impl fmt::Display for ParamKindOrd {
@ -322,6 +323,7 @@ impl fmt::Display for ParamKindOrd {
ParamKindOrd::Lifetime => "lifetime".fmt(f),
ParamKindOrd::Type => "type".fmt(f),
ParamKindOrd::Const => "const".fmt(f),
ParamKindOrd::ConstUnordered => "const".fmt(f),
}
}
}

3
src/librustc_ast_passes/ast_validation.rs
View file

@ -735,8 +735,7 @@ fn validate_generic_param_order<'a>(
}
let max_param = &mut max_param;
match max_param {
Some(ParamKindOrd::Const)
if ParamKindOrd::Type == kind && sess.features_untracked().const_generics => {}
Some(ParamKindOrd::ConstUnordered) if kind != ParamKindOrd::Lifetime => (),
Some(max_param) if *max_param > kind => {
let entry = out_of_order.entry(kind).or_insert((*max_param, vec![]));
entry.1.push(span);