PrefixMatcher wasn't totally ordered + cleanup.

Author: WINSDK

README.md

@@ -15,8 +15,8 @@
 ![](https://img.shields.io/github/license/WINSDK/bite)
 
 `BiTE` is a platform-agnostic executable analysis tool. It aims to offer an
-environment for inspecting the content of binaries and it's debug info. While it is
-still in early development, it supports various architectures.
+environment for inspecting the content of binaries and their debug info. While it is
+still in early development, various architectures are supported.
 
 ## Showcase
 

debugvault/src/dwarf.rs

@@ -63,15 +63,13 @@ impl Dwarf {
         Ok(Dwarf { file_attrs })
     }
 
-    #[allow(dead_code)]
     pub fn load(path: &Path) -> Result<Self> {
         let file = std::fs::File::open(path)?;
         let mmap = unsafe { memmap2::Mmap::map(&file)? };
         let obj = object::File::parse(&*mmap)?;
         Self::parse(&obj)
     }
 
-    #[allow(dead_code)]
     pub fn merge(&mut self, other: Self) {
         self.file_attrs.extend(other.file_attrs);
     }

debugvault/src/itanium/error.rs

@@ -82,8 +82,7 @@ impl fmt::Display for Error {
     }
 }
 
-#[cfg(feature = "std")]
-impl error::Error for Error {
+impl std::error::Error for Error {
     fn description(&self) -> &str {
         match *self {
             Error::UnexpectedEnd => "mangled symbol ends abruptly",
@@ -98,10 +97,6 @@ impl error::Error for Error {
             Error::ForwardTemplateArgReference => {
                 "reference to a template arg from itself or a later template arg"
             }
-            Error::BadFunctionArgReference => {
-                "reference to a function arg that is either out-of-bounds, or in a context \
-                 without function args"
-            }
             Error::BadLeafNameReference => {
                 "reference to a leaf name in a context where there is no current leaf name"
             }

debugvault/src/prefix.rs

@@ -3,7 +3,21 @@ use std::{cmp::Ordering, sync::Arc};
 
 use crate::Symbol;
 
-fn cmp(a: &str, b: &str) -> Ordering {
+#[inline]
+fn sort_cmp(a: &str, b: &str) -> Ordering {
+    for (x, y) in a.chars().zip(b.chars()) {
+        if x < y {
+            return Ordering::Less;
+        } else if x > y {
+            return Ordering::Greater;
+        }
+    }
+
+    a.len().cmp(&b.len())
+}
+
+#[inline]
+fn find_cmp(a: &str, b: &str) -> Ordering {
     for (x, y) in a.chars().zip(b.chars()) {
         if x < y {
             return Ordering::Less;
@@ -29,28 +43,27 @@ impl PrefixMatcher {
 
     /// Sorts elements to allow for searching.
     pub fn reorder(&mut self) {
-        self.items.sort_unstable_by(|a, b| cmp(a.as_str(), b.as_str()));
+        self.items.sort_unstable_by(|a, b| sort_cmp(a.as_str(), b.as_str()));
         self.items.shrink_to_fit();
     }
 
     /// Find some given prefix and return a range back into the items.
     /// Must call [`PrefixMatch::reorder`] before calling this.
     pub fn find(&self, prefix: &str) -> Match {
         // This works as cmp() will return Ordering::Equal if the prefix matches.
-        let mid = match self.items.binary_search_by(|item| cmp(item.as_str(), prefix)) {
-            Ok(idx) => idx,
-            Err(_) => return Match { range: 0..0 },
+        let Ok(mid) = self.items.binary_search_by(|item| find_cmp(item.as_str(), prefix)) else {
+            return Match { range: 0..0 };
         };
 
         // Look left and try to find more matching prefixes
         let mut start = mid;
-        while start != 0 && self.items[start - 1].as_str().starts_with(prefix) {
+        while start > 0 && self.items[start - 1].as_str().starts_with(prefix) {
             start -= 1;
         }
 
         // Look right and try to find more matching prefixes
         let mut end = mid;
-        while end != self.items.len() && self.items[end + 1].as_str().starts_with(prefix) {
+        while end + 1 < self.items.len() && self.items[end + 1].as_str().starts_with(prefix) {
             end += 1;
         }
 

gui/src/widgets/text_edit.rs

@@ -35,8 +35,6 @@ pub struct TextEditOutput {
 ///
 /// Attention: You also need to `store` the updated state.
 #[derive(Clone, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-#[cfg_attr(feature = "serde", serde(default))]
 pub struct TextEditState {
     cursor_range: Option<CursorRange>,
 
@@ -45,15 +43,12 @@ pub struct TextEditState {
     ccursor_range: Option<CCursorRange>,
 
     /// Wrapped in Arc for cheaper clones.
-    #[cfg_attr(feature = "serde", serde(skip))]
     pub(crate) undoer: Arc<Mutex<Undoer>>,
 
     // If IME candidate window is shown on this text edit.
-    #[cfg_attr(feature = "serde", serde(skip))]
     pub(crate) has_ime: bool,
 
     // Visual offset when editing singleline text bigger than the width.
-    #[cfg_attr(feature = "serde", serde(skip))]
     pub(crate) singleline_offset: f32,
 }
 
@@ -1020,28 +1015,6 @@ fn events(
                     None
                 }
             }
-
-            #[cfg(feature = "accesskit")]
-            Event::AccessKitActionRequest(accesskit::ActionRequest {
-                action: accesskit::Action::SetTextSelection,
-                target,
-                data: Some(accesskit::ActionData::SetTextSelection(selection)),
-            }) => {
-                if id.accesskit_id() == *target {
-                    let primary =
-                        ccursor_from_accesskit_text_position(id, galley, &selection.focus);
-                    let secondary =
-                        ccursor_from_accesskit_text_position(id, galley, &selection.anchor);
-                    if let (Some(primary), Some(secondary)) = (primary, secondary) {
-                        Some(CCursorRange { primary, secondary })
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                }
-            }
-
             _ => None,
         };