Extract an asm-cleanup library for reuse

Author: shepmaster

.github/workflows/ci.yml

@@ -185,7 +185,7 @@ jobs:
       run: cargo fmt --manifest-path top-crates/Cargo.toml --check
     - name: Build backend
       run: |-
-        mkdir -p ui/target; docker run --rm -v $PWD/compiler/base/modify-cargo-toml:/compiler/base/modify-cargo-toml -v $PWD/ui:/ui -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry --workdir /ui rust:alpine sh -c '
+        mkdir -p ui/target; docker run --rm -v $PWD/compiler/base/asm-cleanup:/compiler/base/asm-cleanup -v $PWD/compiler/base/modify-cargo-toml:/compiler/base/modify-cargo-toml -v $PWD/ui:/ui -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry --workdir /ui rust:alpine sh -c '
           apk add musl-dev openssl-dev openssl-libs-static
 
           # Adding -C relocation-model=static due to

ci/workflows.yml

@@ -288,6 +288,7 @@ workflows:
                 docker
                 run
                 --rm
+                -v $PWD/compiler/base/asm-cleanup:/compiler/base/asm-cleanup
                 -v $PWD/compiler/base/modify-cargo-toml:/compiler/base/modify-cargo-toml
                 -v $PWD/ui:/ui
                 -v ~/.cargo/git:/root/.cargo/git

compiler/base/.dockerignore

@@ -1 +1,2 @@
+asm-cleanup/target
 modify-cargo-toml/target

compiler/base/asm-cleanup/.gitignore

@@ -0,0 +1,2 @@
+Cargo.lock
+target/

compiler/base/asm-cleanup/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "asm-cleanup"
+version = "0.1.0"
+edition = "2018"
+
+[workspace]
+
+[dependencies]
+lazy_static = "1.0.0"
+petgraph = "0.6.0"
+regex = "1.0.0"
+rustc-demangle = "0.1.5"

ui/src/asm_cleanup.rs renamed to compiler/base/asm-cleanup/src/lib.rs

@@ -9,17 +9,16 @@ default = ['fork-bomb-prevention']
 fork-bomb-prevention = []
 
 [dependencies]
+asm-cleanup = { path = "../compiler/base/asm-cleanup" }
 async-trait = "0.1.52"
 axum = { version = "0.6", features = ["headers", "ws"] }
 dotenv = "0.15.0"
 futures = "0.3.21"
 lazy_static = "1.0.0"
 octocrab = "0.25"
 openssl-probe = "0.1.2"
-petgraph = "0.6.0"
 prometheus = "0.13.0"
 regex = "1.0.0"
-rustc-demangle = "0.1.5"
 serde = { version = "1.0", features = ["rc"] }
 serde_derive = "1.0"
 serde_json = "1.0"

ui/Cargo.lock

@@ -14,7 +14,6 @@ use tracing::{error, info, warn};
 const DEFAULT_ADDRESS: &str = "127.0.0.1";
 const DEFAULT_PORT: u16 = 5000;
 
-mod asm_cleanup;
 mod env;
 mod gist;
 mod metrics;

ui/Cargo.toml

@@ -314,11 +314,11 @@ impl Sandbox {
 
         if let CompileTarget::Assembly(_, demangle, process) = req.target {
             if demangle == DemangleAssembly::Demangle {
-                code = crate::asm_cleanup::demangle_asm(&code);
+                code = asm_cleanup::demangle_asm(&code);
             }
 
             if process == ProcessAssembly::Filter {
-                code = crate::asm_cleanup::filter_asm(&code);
+                code = asm_cleanup::filter_asm(&code);
             }
         } else if CompileTarget::Hir == req.target {
             // TODO: Run rustfmt on the generated HIR.