Skip to content

Commit

Permalink
refactor: hax-phase-debug-webapp is no longer a separate crate
Browse files Browse the repository at this point in the history
  • Loading branch information
W95Psp committed Oct 7, 2024
1 parent 297c837 commit 2834644
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 29 deletions.
9 changes: 1 addition & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ members = [
"cli/subcommands",
"cli/driver",
"test-harness",
"engine/utils/phase-debug-webapp",
"hax-lib",
"hax-lib-macros",
"hax-lib-macros/types",
Expand All @@ -23,7 +22,6 @@ default-members = [
"cli/subcommands",
"cli/driver",
"test-harness",
"engine/utils/phase-debug-webapp",
"hax-lib",
"hax-lib-macros",
"hax-lib-macros/types",
Expand Down Expand Up @@ -77,7 +75,6 @@ annotate-snippets = "0.11"
hax-frontend-exporter = { path = "frontend/exporter", version = "=0.1.0-pre.1", default-features = false }
hax-adt-into = { path = "frontend/exporter/adt-into", version = "=0.1.0-pre.1" }
hax-frontend-exporter-options = { path = "frontend/exporter/options", version = "=0.1.0-pre.1" }
hax-phase-debug-webapp = { path = "engine/utils/phase-debug-webapp", version = "=0.1.0-pre.1" }
hax-lib-macros-types = { path = "hax-lib-macros/types", version = "=0.1.0-pre.1" }
hax-lib-macros = { path = "hax-lib-macros", version = "=0.1.0-pre.1" }
hax-lib = { path = "hax-lib", version = "=0.1.0-pre.1" }
Expand Down
2 changes: 1 addition & 1 deletion cli/subcommands/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ version_check = "0.9"
rustup-toolchain = "0.1"
colored.workspace = true
is-terminal = "0.4.9"
hax-phase-debug-webapp.workspace = true
tiny_http = "0.12"
inquire = "0.6"
annotate-snippets.workspace = true
serde-jsonlines = "0.5.0"
Expand Down
4 changes: 3 additions & 1 deletion cli/subcommands/src/cargo_hax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ use std::io::Write;
use std::path::PathBuf;
use std::process;

mod engine_debug_webapp;

/// Return a toolchain argument to pass to `cargo`: when the correct nightly is
/// already present, this is None, otherwise we (1) ensure `rustup` is available
/// (2) install the nightly (3) return the toolchain
Expand Down Expand Up @@ -340,7 +342,7 @@ fn run_engine(
eprintln!("----------------------------------------------");
eprintln!("----------------------------------------------");
eprintln!("----------------------------------------------");
hax_phase_debug_webapp::run(|| debug_json.clone())
engine_debug_webapp::run(|| debug_json.clone())
}
Some(DebugEngineMode::File(_file)) if !backend.dry_run => {
println!("{}", debug_json)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ pub fn run(get_json: impl Fn() -> String) {
let ct_utf8 = Header::from_bytes(&b"charset"[..], &b"utf-8"[..]).unwrap();
for request in server.incoming_requests() {
let response = match request.url() {
"/" => Response::from_string(include_str!("../static/index.html"))
"/" => Response::from_string(include_str!("static/index.html"))
.with_header(ct_html.clone())
.with_header(ct_utf8.clone()),
"/script.js" => Response::from_string(include_str!("../static/script.js"))
"/script.js" => Response::from_string(include_str!("static/script.js"))
.with_header(ct_js.clone())
.with_header(ct_utf8.clone()),
path if path.starts_with("/debug-hax-engine.json") => {
Expand Down
14 changes: 0 additions & 14 deletions engine/utils/phase-debug-webapp/Cargo.toml

This file was deleted.

0 comments on commit 2834644

Please sign in to comment.