Merge branch 'main' into coderabbit/changes/b669491d

Author: hyperpolymath

bots/rhodibot/src/canon/requirement.rs

@@ -143,10 +143,9 @@ fn split_on<'a>(text: &'a str, separators: &[&str]) -> Vec<&'a str> {
     // Iterated by character, not by byte: the canon's descriptions carry em
     // dashes, and stepping through bytes would cut them in half.
     while index < text.len() {
-        let ch = text[index..]
-            .chars()
-            .next()
-            .expect("index is a char boundary");
+        let Some(ch) = text[index..].chars().next() else {
+            break;
+        };
 
         match ch {
             '{' => depth += 1,

bots/rhodibot/src/canon/verdict.rs

@@ -402,13 +402,16 @@ fn classify_group(
     //    leftover under a retired one is moving, not living in the retired one
     //    -- calling that "deprecated location" would overstate it.
     let mut live: Vec<String> = Vec::new();
-    let mut retired: Vec<String> = Vec::new();
+    let mut retired: Vec<(String, &Deprecation)> = Vec::new();
     for alternative in alternatives.iter().filter(|path| !path.ends_with('/')) {
         let basename = basename(alternative);
         for file in files.iter().filter(|file| basename_of(file) == basename) {
-            if is_retired(file, deprecations) {
-                if !retired.contains(file) {
-                    retired.push(file.clone());
+            if let Some(deprecation) = deprecations
+                .iter()
+                .find(|deprecation| deprecation.matches(file))
+            {
+                if !retired.iter().any(|(path, _)| path == file) {
+                    retired.push((file.clone(), deprecation));
                 }
             } else if !live.contains(file) {
                 live.push(file.clone());
@@ -420,16 +423,12 @@ fn classify_group(
         return GroupVerdict::Elsewhere {
             expected: alternatives.to_vec(),
             found: live,
-            deprecated_copies: retired,
+            deprecated_copies: retired.into_iter().map(|(path, _)| path).collect(),
         };
     }
 
     // 4. Present only under a location the canon has retired.
-    if let Some(found) = retired.first() {
-        let deprecated = deprecations
-            .iter()
-            .find(|deprecated| deprecated.matches(found))
-            .expect("a retired path came from a deprecation");
+    if let Some((found, deprecated)) = retired.first() {
         return GroupVerdict::Deprecated {
             found: found.clone(),
             location: deprecated.location.clone(),