fix: Address PR comments

Author: SersemPeca

nix/shells/main.nix

@@ -29,7 +29,6 @@ mkShell {
       # general dependencies
       git
 
-      rustup
       binaryen
       llvmPackages_21.clang-unwrapped
       # clang
@@ -181,6 +180,7 @@ mkShell {
     rustup override set 1.89
     rustup target add wasm32-unknown-unknown
     rustup target add wasm32-unknown-emscripten
+    rustup target add x86_64-unknown-linux-gnu
 
 
     export CPPFLAGS_wasm32_unknown_unknown="--target=wasm32 --sysroot=$(pwd)/src/db-backend/wasm-sysroot -isystem $(pwd)/src/db-backend/wasm-sysroot/include"

src/db-backend/build.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# your sysroot layout: wasm-sysroot/{include,lib,...}
+SYSROOT="$(pwd)/wasm-sysroot"
+
+echo "SYSROOT: ${SYSROOT}"
+
+# make sure we use LLVM tools for wasm C/AR
+export CC_wasm32_unknown_unknown=clang
+export AR_wasm32_unknown_unknown=llvm-ar
+
+cargo clean
+
+# build (just your crate, or the specific package)
+cargo build --target wasm32-unknown-unknown --release --no-default-features --features browser-transport
+
+wasm-pack build --target web --release -- --no-default-features --features browser-transport

src/db-backend/build_wasm.sh

@@ -2,6 +2,7 @@ use std::error::Error;
 use std::fs::create_dir_all;
 use std::io::Write;
 
+#[cfg(feature = "io-transport")]
 use std::os::unix::net::UnixStream;
 
 use std::path::PathBuf;

src/db-backend/src/core.rs

@@ -61,7 +61,7 @@ pub fn make_io_transport() -> Result<(BufReader<std::io::StdinLock<'static>>, st
 
     let stdin = std::io::stdin();
     let stdout = std::io::stdout();
-    let mut reader = BufReader::new(stdin.lock());
+    let reader = BufReader::new(stdin.lock());
     Ok((reader, stdout))
 }
 
@@ -128,22 +128,16 @@ fn launch(trace_folder: &Path, trace_file: &Path, seq: i64) -> Result<Handler, B
     let trace_path = trace_folder.join(trace_file);
     // duration code copied from
     // https://rust-lang-nursery.github.io/rust-cookbook/datetime/duration.html
-    let start = Instant::now();
+    let _start = Instant::now();
     if let (Ok(meta), Ok(trace)) = (
         load_trace_metadata(&metadata_path),
         load_trace_data(&trace_path, trace_file_format),
     ) {
-        let duration = start.elapsed();
-        // info!("loading trace: duration: {:?}", duration);
-
-        let start2 = Instant::now();
+        let _start2 = Instant::now();
         let mut db = Db::new(&meta.workdir);
         let mut proc = TraceProcessor::new(&mut db);
         proc.postprocess(&trace)?;
 
-        let duration2 = start2.elapsed();
-        // info!("postprocessing trace: duration: {:?}", duration2);
-
         let mut handler = Handler::new(Box::new(db));
         handler.dap_client.seq = seq;
         handler.run_to_entry(dap::Request::default())?;
@@ -501,7 +495,7 @@ pub fn handle_message<T: DapTransport>(
         DapMessage::Request(req) => {
             if let Some(h) = ctx.handler.as_mut() {
                 let res = handle_request(h, req.clone(), &mut ctx.seq, transport);
-                if let Err(e) = res {
+                if let Err(_e) = res {
                     // warn!("handle_request error: {e:?}");
                 }
             }

src/db-backend/src/dap_server.rs

@@ -76,7 +76,7 @@ impl Db {
         }
     }
 
-    pub fn step_from(&self, step_id: StepId, forward: bool) -> StepIterator {
+    pub fn step_from(&'_ self, step_id: StepId, forward: bool) -> StepIterator<'_> {
         StepIterator {
             db: self,
             step_id,

src/db-backend/src/db.rs

@@ -121,18 +121,8 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     info!("pid {:?}", std::process::id());
     if cli.stdio {
-        use std::io::BufReader;
-
-        let stdin = std::io::stdin();
-        let stdout = std::io::stdout();
-        let mut reader = BufReader::new(stdin.lock());
-
         let _ = db_backend::dap_server::run_stdio();
     } else {
-        use std::os::unix::net::UnixListener;
-
-        use std::io::BufReader;
-
         let socket_path = if let Some(p) = cli.socket_path {
             p
         } else {

src/db-backend/src/main.rs

@@ -1,4 +1,4 @@
-#[cfg(target_arch = "x86_64")]
+#[cfg(feature = "io-transport")]
 use expanduser::expanduser;
 
 use std::collections::HashMap;

src/db-backend/src/trace_processor.rs

@@ -5,7 +5,6 @@ use db_backend::transport::DapTransport;
 use serde_json::{from_reader, json};
 use std::io::BufReader;
 
-#[cfg(target_arch = "x86_64")]
 use std::os::unix::net::UnixStream;
 
 use std::path::{Path, PathBuf};