Clean up stuttery enum variant names

Author: djc

src/subject_name/dns_name.rs

@@ -319,8 +319,7 @@ pub(super) fn presented_id_matches_reference_id(
     //
     // For excluded subtrees: we still expand the wildcard so that a SAN whose expansions could
     // reach into an excluded subtree is rejected (see CVE-2025-61727).
-    if presented.peek(b'*')
-        && reference_dns_id_role != IdRole::NameConstraint(Subtrees::PermittedSubtrees)
+    if presented.peek(b'*') && reference_dns_id_role != IdRole::NameConstraint(Subtrees::Permitted)
     {
         if presented.skip(1).is_err() {
             unreachable!();
@@ -980,7 +979,7 @@ mod tests {
         for (presented, constraint, expected_result) in PRESENTED_MATCHES_CONSTRAINT {
             let actual_result = presented_id_matches_reference_id(
                 untrusted::Input::from(presented),
-                IdRole::NameConstraint(Subtrees::PermittedSubtrees),
+                IdRole::NameConstraint(Subtrees::Permitted),
                 untrusted::Input::from(constraint),
             );
             assert_eq!(
@@ -995,7 +994,7 @@ mod tests {
         for (presented, constraint, expected_result) in WILDCARD_CONSTRAINT_CONTAINMENT {
             let actual_result = presented_id_matches_reference_id(
                 untrusted::Input::from(presented),
-                IdRole::NameConstraint(Subtrees::PermittedSubtrees),
+                IdRole::NameConstraint(Subtrees::Permitted),
                 untrusted::Input::from(constraint),
             );
             assert_eq!(
@@ -1032,7 +1031,7 @@ mod tests {
         for (presented, constraint, expected_result) in WILDCARD_EXCLUDED_INTERSECTION {
             let actual_result = presented_id_matches_reference_id(
                 untrusted::Input::from(presented),
-                IdRole::NameConstraint(Subtrees::ExcludedSubtrees),
+                IdRole::NameConstraint(Subtrees::Excluded),
                 untrusted::Input::from(constraint),
             );
             assert_eq!(

src/subject_name/mod.rs

@@ -93,8 +93,8 @@ fn check_presented_id_conforms_to_constraints(
     budget: &mut Budget,
 ) -> Option<Result<(), Error>> {
     let subtrees = [
-        (Subtrees::PermittedSubtrees, permitted_subtrees),
-        (Subtrees::ExcludedSubtrees, excluded_subtrees),
+        (Subtrees::Permitted, permitted_subtrees),
+        (Subtrees::Excluded, excluded_subtrees),
     ];
 
     fn general_subtree<'b>(input: &mut untrusted::Reader<'b>) -> Result<GeneralName<'b>, Error> {
@@ -152,8 +152,8 @@ fn check_presented_id_conforms_to_constraints(
                     // Rejection is achieved by not matching any PermittedSubtrees, and matching all
                     // ExcludedSubtrees.
                     match subtrees {
-                        Subtrees::PermittedSubtrees => false,
-                        Subtrees::ExcludedSubtrees => true,
+                        Subtrees::Permitted => false,
+                        Subtrees::Excluded => true,
                     },
                 ),
                 (GeneralName::DirectoryName, _) => continue,
@@ -187,19 +187,19 @@ fn check_presented_id_conforms_to_constraints(
             };
 
             match (subtrees, matches) {
-                (Subtrees::PermittedSubtrees, Ok(true)) => {
+                (Subtrees::Permitted, Ok(true)) => {
                     has_permitted_subtrees_match = true;
                 }
 
-                (Subtrees::PermittedSubtrees, Ok(false)) => {
+                (Subtrees::Permitted, Ok(false)) => {
                     has_permitted_subtrees_mismatch = true;
                 }
 
-                (Subtrees::ExcludedSubtrees, Ok(true)) => {
+                (Subtrees::Excluded, Ok(true)) => {
                     return Some(Err(Error::NameConstraintViolation));
                 }
 
-                (Subtrees::ExcludedSubtrees, Ok(false)) => (),
+                (Subtrees::Excluded, Ok(false)) => (),
                 (_, Err(err)) => return Some(Err(err)),
             }
         }
@@ -217,8 +217,8 @@ fn check_presented_id_conforms_to_constraints(
 
 #[derive(Clone, Copy, PartialEq)]
 enum Subtrees {
-    PermittedSubtrees,
-    ExcludedSubtrees,
+    Permitted,
+    Excluded,
 }
 
 pub(crate) struct NameIterator<'a> {