diff --git a/Cargo.lock b/Cargo.lock index f721ce9c3..8462089a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,7 +163,7 @@ dependencies = [ [[package]] name = "cargo-hax" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "annotate-snippets", "cargo_metadata", @@ -173,7 +173,6 @@ dependencies = [ "hax-frontend-exporter", "hax-frontend-exporter-options", "hax-lib-macros-types", - "hax-phase-debug-webapp", "hax-types", "inquire", "is-terminal", @@ -188,6 +187,7 @@ dependencies = [ "serde_json", "syn 2.0.79", "tempfile", + "tiny_http", "toml 0.8.19", "version_check", "which", @@ -464,7 +464,7 @@ checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "hax-adt-into" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "itertools", "proc-macro2", @@ -475,7 +475,7 @@ dependencies = [ [[package]] name = "hax-bounded-integers" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "duplicate", "hax-lib", @@ -484,7 +484,7 @@ dependencies = [ [[package]] name = "hax-driver" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "clap", "colored", @@ -502,7 +502,7 @@ dependencies = [ [[package]] name = "hax-engine-names" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "hax-lib", "hax-lib-protocol", @@ -510,7 +510,7 @@ dependencies = [ [[package]] name = "hax-engine-names-extract" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "bincode", "hax-adt-into", @@ -522,7 +522,7 @@ dependencies = [ [[package]] name = "hax-frontend-exporter" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "bincode", "extension-traits", @@ -539,7 +539,7 @@ dependencies = [ [[package]] name = "hax-frontend-exporter-options" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "bincode", "hax-adt-into", @@ -550,7 +550,7 @@ dependencies = [ [[package]] name = "hax-lib" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "hax-lib-macros", "num-bigint", @@ -559,7 +559,7 @@ dependencies = [ [[package]] name = "hax-lib-macros" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "hax-lib", "hax-lib-macros-types", @@ -572,7 +572,7 @@ dependencies = [ [[package]] name = "hax-lib-macros-types" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "proc-macro2", "quote", @@ -584,14 +584,14 @@ dependencies = [ [[package]] name = "hax-lib-protocol" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "libcrux", ] [[package]] name = "hax-lib-protocol-macros" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "proc-macro-error", "proc-macro2", @@ -599,16 +599,9 @@ dependencies = [ "syn 2.0.79", ] -[[package]] -name = "hax-phase-debug-webapp" -version = "0.1.0-pre.1" -dependencies = [ - "tiny_http", -] - [[package]] name = "hax-test-harness" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "assert_cmd", "cargo_metadata", @@ -624,7 +617,7 @@ dependencies = [ [[package]] name = "hax-types" -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" dependencies = [ "annotate-snippets", "bincode", diff --git a/Cargo.toml b/Cargo.toml index 5e17ffda4..f64e16d76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", @@ -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", @@ -34,7 +32,7 @@ default-members = [ resolver = "2" [workspace.package] -version = "0.1.0-pre.1" +version = "0.1.0-alpha.1" authors = ["hax Authors"] license = "Apache-2.0" homepage = "https://github.com/hacspec/hax" @@ -74,12 +72,11 @@ bincode = "2.0.0-rc.3" annotate-snippets = "0.11" # Crates in this repository -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" } -hax-engine-names = { path = "engine/names", version = "=0.1.0-pre.1" } -hax-types = { path = "hax-types", version = "=0.1.0-pre.1" } +hax-frontend-exporter = { path = "frontend/exporter", version = "=0.1.0-alpha.1", default-features = false } +hax-adt-into = { path = "frontend/exporter/adt-into", version = "=0.1.0-alpha.1" } +hax-frontend-exporter-options = { path = "frontend/exporter/options", version = "=0.1.0-alpha.1" } +hax-lib-macros-types = { path = "hax-lib-macros/types", version = "=0.1.0-alpha.1" } +hax-lib-macros = { path = "hax-lib-macros", version = "=0.1.0-alpha.1" } +hax-lib = { path = "hax-lib", version = "=0.1.0-alpha.1" } +hax-engine-names = { path = "engine/names", version = "=0.1.0-alpha.1" } +hax-types = { path = "hax-types", version = "=0.1.0-alpha.1" } diff --git a/cli/subcommands/Cargo.toml b/cli/subcommands/Cargo.toml index 7efc93be4..91512f584 100644 --- a/cli/subcommands/Cargo.toml +++ b/cli/subcommands/Cargo.toml @@ -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" @@ -53,3 +53,9 @@ hax-frontend-exporter.workspace = true hax-lib-macros-types = {workspace = true, features = ["schemars"]} version_check = "0.9" toml = "0.8" + +[[package.metadata.release.pre-release-replacements]] +file = "../../engine/dune-project" +search = "version [a-z0-9\\.-]+" +replace = "version {{version}}" +prerelease = true diff --git a/cli/subcommands/src/cargo_hax.rs b/cli/subcommands/src/cargo_hax.rs index 000348260..3f73c92c1 100644 --- a/cli/subcommands/src/cargo_hax.rs +++ b/cli/subcommands/src/cargo_hax.rs @@ -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 @@ -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) diff --git a/engine/utils/phase-debug-webapp/README.md b/cli/subcommands/src/engine_debug_webapp/README.md similarity index 100% rename from engine/utils/phase-debug-webapp/README.md rename to cli/subcommands/src/engine_debug_webapp/README.md diff --git a/engine/utils/phase-debug-webapp/src/lib.rs b/cli/subcommands/src/engine_debug_webapp/mod.rs similarity index 94% rename from engine/utils/phase-debug-webapp/src/lib.rs rename to cli/subcommands/src/engine_debug_webapp/mod.rs index 598114725..ce494b405 100644 --- a/engine/utils/phase-debug-webapp/src/lib.rs +++ b/cli/subcommands/src/engine_debug_webapp/mod.rs @@ -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") => { diff --git a/engine/utils/phase-debug-webapp/static/index.html b/cli/subcommands/src/engine_debug_webapp/static/index.html similarity index 100% rename from engine/utils/phase-debug-webapp/static/index.html rename to cli/subcommands/src/engine_debug_webapp/static/index.html diff --git a/engine/utils/phase-debug-webapp/static/script.js b/cli/subcommands/src/engine_debug_webapp/static/script.js similarity index 100% rename from engine/utils/phase-debug-webapp/static/script.js rename to cli/subcommands/src/engine_debug_webapp/static/script.js diff --git a/engine/dune-project b/engine/dune-project index 6cf643031..11531cc1b 100644 --- a/engine/dune-project +++ b/engine/dune-project @@ -2,6 +2,8 @@ (name hax-engine) +(version 0.1.0-alpha.1) + (generate_opam_files true) (source diff --git a/engine/utils/phase-debug-webapp/Cargo.toml b/engine/utils/phase-debug-webapp/Cargo.toml deleted file mode 100644 index de32411f3..000000000 --- a/engine/utils/phase-debug-webapp/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "hax-phase-debug-webapp" -version.workspace = true -authors.workspace = true -license.workspace = true -homepage.workspace = true -edition.workspace = true -repository.workspace = true -readme.workspace = true - -[lib] - -[dependencies] -tiny_http = "0.12" diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e4ff82da8..7df1c9ab7 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -11,5 +11,5 @@ resolver = "2" [workspace.dependencies] hax-lib-macros = { path = "../hax-lib-macros" } hax-lib = { path = "../hax-lib" } -hax-bounded-integers = { path = "../hax-bounded-integers", version = "=0.1.0-pre.1" } +hax-bounded-integers = { path = "../hax-bounded-integers" } diff --git a/flake.nix b/flake.nix index 969ba4a33..4fd03ee02 100644 --- a/flake.nix +++ b/flake.nix @@ -189,6 +189,7 @@ pkgs.ocamlPackages.utop pkgs.cargo-expand + pkgs.cargo-release pkgs.cargo-insta pkgs.openssl.dev pkgs.pkg-config diff --git a/hax-bounded-integers/Cargo.toml b/hax-bounded-integers/Cargo.toml index faad00ace..911fc865a 100644 --- a/hax-bounded-integers/Cargo.toml +++ b/hax-bounded-integers/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true edition.workspace = true repository.workspace = true readme.workspace = true +description = "Newtypes for working with bounded integers with hax" [dependencies] duplicate = "1.0.0" diff --git a/hax-types/Cargo.toml b/hax-types/Cargo.toml index c273670f2..37f39615e 100644 --- a/hax-types/Cargo.toml +++ b/hax-types/Cargo.toml @@ -7,6 +7,7 @@ homepage.workspace = true edition.workspace = true repository.workspace = true readme.workspace = true +description = "Helper crate defining the types used to communicate between the custom rustc driver, the CLI and the engine of hax." [dependencies] clap = { workspace = true, features = ["env"] }