[Cargo] Swap bincode -> postcard

The bincode library is no longer maintained, so swapping to postcard.

Author: ttiimm

Cargo.lock

@@ -20,12 +20,15 @@ include = [
 ]
 
 [dependencies]
-bincode = { version = "2.0.1", features = ["serde", "std"]}
 clap = { version = "4.5.36", features = ["std", "derive"] }
 colored_json = "5.0.0"
 directories = "6.0.0"
+ignore = "0.4"
 indicatif = "0.18.0"
 itertools = "0.14.0"
+miette = { version = "7.6.0", features = ["fancy", "serde"] }
+postcard = { version = "1.1.3", features = ["use-std"]}
+rayon = "1.11.0"
 regex = "1.11.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
@@ -38,9 +41,6 @@ tree-sitter-cpp = "0.23.4"
 tree-sitter-rust-orchard = "0.12.0"
 tree-sitter-java = "0.23.5"
 tree-sitter-python = "0.25.0"
-ignore = "0.4"
-rayon = "1.11.0"
-miette = { version = "7.6.0", features = ["fancy", "serde"] }
 
 [build-dependencies]
 cc="*"

Cargo.toml

@@ -1,7 +1,6 @@
 #[macro_use]
 extern crate log;
 
-
 #[derive(Debug)]
 enum Animal {
     Sheep,

examples/animals.rs

@@ -11,7 +11,11 @@ pub(crate) struct CodeSource {
 }
 
 impl CodeSource {
-    pub(crate) fn new<I>(path: &Path, info: SourceFileInfo, mut input: I) -> Result<CodeSource, LogError>
+    pub(crate) fn new<I>(
+        path: &Path,
+        info: SourceFileInfo,
+        mut input: I,
+    ) -> Result<CodeSource, LogError>
     where
         I: io::Read,
     {

src/code_source.rs

@@ -72,7 +72,6 @@ pub use progress::WorkInfo;
 use source_query::QueryResult;
 pub use source_ref::{CallSite, SourceRef};
 
-
 #[derive(Error, Debug, Diagnostic, Clone, Default)]
 pub enum LogError {
     #[default]
@@ -184,7 +183,7 @@ pub(crate) enum Revision {
 
 #[derive(Serialize, Deserialize, Debug)]
 pub(crate) enum CacheEntryFormat {
-    Bincode,
+    Postcard,
 }
 
 /// Header for an entry in the cache.  Currently, this is more of interest to humans than machines.
@@ -325,12 +324,12 @@ impl LogMatcher {
             }
         })?;
         // XXX check that the path matches?
-        let mut decoded_root: SourceTree =
-            bincode::serde::decode_from_std_read(&mut reader, bincode::config::standard())
-                .map_err(|err| LogError::FailedToReadCache {
-                    path: path.to_owned(),
-                    source: Arc::new(err),
-                })?;
+        let mut scratch = [0u8; 1024];
+        let (mut decoded_root, _) = postcard::from_io::<SourceTree, _>((&mut reader, &mut scratch))
+            .map_err(|err| LogError::FailedToReadCache {
+                path: path.to_owned(),
+                source: Arc::new(err),
+            })?;
         for sif in decoded_root.files_with_statements.values_mut() {
             sif.try_creating_matcher();
             sif.to_lookup_pair().into_iter().for_each(|(name, sid)| {
@@ -413,7 +412,7 @@ impl LogMatcher {
                 let header = CacheEntryHeader {
                     schema: CacheEntrySchema::V1,
                     revision: Revision::Current,
-                    format: CacheEntryFormat::Bincode,
+                    format: CacheEntryFormat::Postcard,
                     path: root_path.to_string_lossy().to_string(),
                     timestamp: SystemTime::now()
                         .duration_since(UNIX_EPOCH)
@@ -423,8 +422,7 @@ impl LogMatcher {
                 serde_json::to_writer(&file, &header).map_err(to_write_cache_error)?;
                 file.write_all("\n".as_bytes())
                     .map_err(to_write_cache_error)?;
-                bincode::serde::encode_into_std_write(root, &mut file, bincode::config::standard())
-                    .map_err(to_write_cache_error)?;
+                postcard::to_io(root, &mut file).map_err(to_write_cache_error)?;
                 total_size = total_size.saturating_add(file.stream_position().unwrap_or(0));
                 file.into_temp_path()
             };
@@ -584,8 +582,7 @@ impl LogMatcher {
                         .iter()
                         .flat_map(|path| coll.files_with_statements.get(path))
                         .flat_map(|stmts| {
-                            let file_matches =
-                                stmts.matcher.as_ref()?.matches(body);
+                            let file_matches = stmts.matcher.as_ref()?.matches(body);
                             match file_matches.iter().next() {
                                 None => None,
                                 Some(index) => stmts.log_statements.get(index),
@@ -598,8 +595,7 @@ impl LogMatcher {
                         .values()
                         .filter(|stmts| stmts.path.contains(filename))
                         .flat_map(|stmts| {
-                            let file_matches =
-                                stmts.matcher.as_ref()?.matches(body);
+                            let file_matches = stmts.matcher.as_ref()?.matches(body);
                             match file_matches.iter().next() {
                                 None => None,
                                 Some(index) => stmts.log_statements.get(index),
@@ -611,11 +607,7 @@ impl LogMatcher {
                 coll.files_with_statements
                     .par_iter()
                     .flat_map(|src_ref_coll| {
-                        let file_matches = src_ref_coll
-                            .1
-                            .matcher
-                            .as_ref()?
-                            .matches(log_ref.body());
+                        let file_matches = src_ref_coll.1.matcher.as_ref()?.matches(log_ref.body());
                         match file_matches.iter().next() {
                             None => None,
                             Some(index) => src_ref_coll.1.log_statements.get(index),

src/lib.rs

@@ -2,13 +2,14 @@ use clap::Parser as ClapParser;
 use colored_json::{ColoredFormatter, CompactFormatter, Styler};
 use indicatif::{ProgressBar, ProgressStyle};
 use log2src::{
-    Cache, LogError, LogFormat, LogMapping, LogMatcher, LogRef, LogRefBuilder, ProgressTracker, ProgressUpdate, set_tracker_once,
+    set_tracker_once, Cache, LogError, LogFormat, LogMapping, LogMatcher, LogRef, LogRefBuilder,
+    ProgressTracker, ProgressUpdate,
 };
 use miette::{IntoDiagnostic, MietteHandlerOpts, Report};
 use serde::Serialize;
 use std::io::{stdout, BufRead, BufReader};
-use std::sync::Arc;
 use std::sync::atomic::Ordering;
+use std::sync::Arc;
 use std::thread::sleep;
 use std::time::Duration;
 use std::{env, fs, io, path::PathBuf};
@@ -212,7 +213,11 @@ fn main() -> miette::Result<()> {
 
     let args = Cli::parse();
     let mut tracker = ProgressTracker::new();
-    let listener = if args.verbose { Some(tracker.subscribe()) } else { None };
+    let listener = if args.verbose {
+        Some(tracker.subscribe())
+    } else {
+        None
+    };
     let tracker = Arc::new(tracker);
     set_tracker_once(Arc::clone(&tracker));
 

src/main.rs

@@ -27,10 +27,7 @@ pub fn set_tracker_once(tracker: Arc<ProgressTracker>) {
 }
 
 pub(crate) fn current_global_progress_tracker() -> Arc<ProgressTracker> {
-    GLOBAL_PROGRESS_TRACKER
-        .get()
-        .cloned()
-        .unwrap_or_default()
+    GLOBAL_PROGRESS_TRACKER.get().cloned().unwrap_or_default()
 }
 
 pub struct WorkInfo {

src/progress.rs

@@ -10,10 +10,12 @@ info:
     - "-f"
     - "^(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}) (?<thread>\\d+) (?<body>.*)$"
   env:
+    APPDATA: /var/folders/hq/4yhdz_bx6ygfyxl54gnpygc80000gn/T/.tmpF9O5Dv
     COLS: "1000"
-    HOME: /var/folders/gq/s3t7n95d19g3w41nsw0m0n240000gn/T/.tmpzzq9Js
-    USERPROFILE: /var/folders/gq/s3t7n95d19g3w41nsw0m0n240000gn/T/.tmpzzq9Js
-    XDG_CONFIG_HOME: /var/folders/gq/s3t7n95d19g3w41nsw0m0n240000gn/T/.tmpzzq9Js
+    HOME: /var/folders/hq/4yhdz_bx6ygfyxl54gnpygc80000gn/T/.tmpF9O5Dv
+    LOCALAPPDATA: /var/folders/hq/4yhdz_bx6ygfyxl54gnpygc80000gn/T/.tmpF9O5Dv
+    USERPROFILE: /var/folders/hq/4yhdz_bx6ygfyxl54gnpygc80000gn/T/.tmpF9O5Dv
+    XDG_CONFIG_HOME: /var/folders/hq/4yhdz_bx6ygfyxl54gnpygc80000gn/T/.tmpF9O5Dv
 ---
 success: true
 exit_code: 0
@@ -23,4 +25,4 @@ exit_code: 0
 
 ----- stderr -----
   ⚠ failed to read cache file "cache.XXX"
-  ╰─▶ Io { inner: Error { kind: UnexpectedEof, message: "failed to fill whole buffer" }, additional: 39 }
+  ╰─▶ Hit the end of buffer, expected more data