save

Cargo.toml

@@ -9,7 +9,7 @@ edition = "2021"
 
 [lints.rust]
 warnings = "deny"
-missing_docs = "deny"
+# missing_docs = "deny"
 
 [lints.clippy]
 all = { level = "deny", priority = -1 }

src/builder.rs

@@ -21,6 +21,7 @@
 use std::cmp::Ordering;
 use std::collections::BinaryHeap;
 
+use crate::find_longest::FindLongestSymbol;
 use crate::{Code, Symbol, SymbolTable};
 
 #[derive(Debug, Clone)]
@@ -147,10 +148,13 @@ impl SymbolTable {
         }
 
         // Pop the 255 best symbols.
-        pqueue
-            .iter()
-            .take(255)
-            .for_each(|candidate| res.insert(candidate.symbol));
+        let mut n_symbols = 0;
+        while !pqueue.is_empty() && n_symbols < 255 {
+            let candidate = pqueue.pop().unwrap();
+            if res.insert(candidate.symbol) {
+                n_symbols += 1;
+            }
+        }
 
         res
     }

src/find_longest/mod.rs

@@ -0,0 +1,21 @@
+// Copyright 2024 Spiral, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::Code;
+
+mod naive;
+
+pub trait FindLongestSymbol {
+    fn find_longest_symbol(&self, text: &[u8]) -> Code;
+}

src/longest.rs → src/find_longest/naive.rs

@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::find_longest::FindLongestSymbol;
 use crate::{Code, SymbolTable};
 
 /// Find the longest substring.
 
-impl SymbolTable {
+impl FindLongestSymbol for SymbolTable {
     // NOTE(aduffy): if you don't disable inlining, this function won't show up in profiles.
     #[inline(never)]
-    pub(crate) fn find_longest_symbol(&self, text: &[u8]) -> Code {
+    fn find_longest_symbol(&self, text: &[u8]) -> Code {
         debug_assert!(!text.is_empty(), "text must not be empty");
 
         // Find the code that best maps to the provided text table here.