From 1ae1a6332c27fd5f384d3877cb2c4b546dd86c37 Mon Sep 17 00:00:00 2001
From: kadmin <julianknodt@gmail.com>
Date: Wed, 5 Aug 2020 22:36:47 +0000
Subject: [PATCH] Add ParamKindOrd::ConstUnordered variant

---
 src/librustc_ast/ast.rs                   | 2 ++
 src/librustc_ast_passes/ast_validation.rs | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/librustc_ast/ast.rs b/src/librustc_ast/ast.rs
index 3d2625917470..95e01f07e01b 100644
--- a/src/librustc_ast/ast.rs
+++ b/src/librustc_ast/ast.rs
@@ -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),
         }
     }
 }
diff --git a/src/librustc_ast_passes/ast_validation.rs b/src/librustc_ast_passes/ast_validation.rs
index bc249ada7e30..7179a59c0dd9 100644
--- a/src/librustc_ast_passes/ast_validation.rs
+++ b/src/librustc_ast_passes/ast_validation.rs
@@ -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);