Skip to content

Commit c37db7c

Browse files
authored
Merge pull request #969 from hacspec/release-0.1.0-alpha
Release `0.1.0-alpha.1`
2 parents 2b50069 + 8f7776b commit c37db7c

File tree

14 files changed

+43
-54
lines changed

14 files changed

+43
-54
lines changed

Cargo.lock

+16-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+9-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ members = [
55
"cli/subcommands",
66
"cli/driver",
77
"test-harness",
8-
"engine/utils/phase-debug-webapp",
98
"hax-lib",
109
"hax-lib-macros",
1110
"hax-lib-macros/types",
@@ -23,7 +22,6 @@ default-members = [
2322
"cli/subcommands",
2423
"cli/driver",
2524
"test-harness",
26-
"engine/utils/phase-debug-webapp",
2725
"hax-lib",
2826
"hax-lib-macros",
2927
"hax-lib-macros/types",
@@ -34,7 +32,7 @@ default-members = [
3432
resolver = "2"
3533

3634
[workspace.package]
37-
version = "0.1.0-pre.1"
35+
version = "0.1.0-alpha.1"
3836
authors = ["hax Authors"]
3937
license = "Apache-2.0"
4038
homepage = "https://github.com/hacspec/hax"
@@ -74,12 +72,11 @@ bincode = "2.0.0-rc.3"
7472
annotate-snippets = "0.11"
7573

7674
# Crates in this repository
77-
hax-frontend-exporter = { path = "frontend/exporter", version = "=0.1.0-pre.1", default-features = false }
78-
hax-adt-into = { path = "frontend/exporter/adt-into", version = "=0.1.0-pre.1" }
79-
hax-frontend-exporter-options = { path = "frontend/exporter/options", version = "=0.1.0-pre.1" }
80-
hax-phase-debug-webapp = { path = "engine/utils/phase-debug-webapp", version = "=0.1.0-pre.1" }
81-
hax-lib-macros-types = { path = "hax-lib-macros/types", version = "=0.1.0-pre.1" }
82-
hax-lib-macros = { path = "hax-lib-macros", version = "=0.1.0-pre.1" }
83-
hax-lib = { path = "hax-lib", version = "=0.1.0-pre.1" }
84-
hax-engine-names = { path = "engine/names", version = "=0.1.0-pre.1" }
85-
hax-types = { path = "hax-types", version = "=0.1.0-pre.1" }
75+
hax-frontend-exporter = { path = "frontend/exporter", version = "=0.1.0-alpha.1", default-features = false }
76+
hax-adt-into = { path = "frontend/exporter/adt-into", version = "=0.1.0-alpha.1" }
77+
hax-frontend-exporter-options = { path = "frontend/exporter/options", version = "=0.1.0-alpha.1" }
78+
hax-lib-macros-types = { path = "hax-lib-macros/types", version = "=0.1.0-alpha.1" }
79+
hax-lib-macros = { path = "hax-lib-macros", version = "=0.1.0-alpha.1" }
80+
hax-lib = { path = "hax-lib", version = "=0.1.0-alpha.1" }
81+
hax-engine-names = { path = "engine/names", version = "=0.1.0-alpha.1" }
82+
hax-types = { path = "hax-types", version = "=0.1.0-alpha.1" }

cli/subcommands/Cargo.toml

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ version_check = "0.9"
3535
rustup-toolchain = "0.1"
3636
colored.workspace = true
3737
is-terminal = "0.4.9"
38-
hax-phase-debug-webapp.workspace = true
38+
tiny_http = "0.12"
3939
inquire = "0.6"
4040
annotate-snippets.workspace = true
4141
serde-jsonlines = "0.5.0"
@@ -53,3 +53,9 @@ hax-frontend-exporter.workspace = true
5353
hax-lib-macros-types = {workspace = true, features = ["schemars"]}
5454
version_check = "0.9"
5555
toml = "0.8"
56+
57+
[[package.metadata.release.pre-release-replacements]]
58+
file = "../../engine/dune-project"
59+
search = "version [a-z0-9\\.-]+"
60+
replace = "version {{version}}"
61+
prerelease = true

cli/subcommands/src/cargo_hax.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ use std::io::Write;
1212
use std::path::PathBuf;
1313
use std::process;
1414

15+
mod engine_debug_webapp;
16+
1517
/// Return a toolchain argument to pass to `cargo`: when the correct nightly is
1618
/// already present, this is None, otherwise we (1) ensure `rustup` is available
1719
/// (2) install the nightly (3) return the toolchain
@@ -340,7 +342,7 @@ fn run_engine(
340342
eprintln!("----------------------------------------------");
341343
eprintln!("----------------------------------------------");
342344
eprintln!("----------------------------------------------");
343-
hax_phase_debug_webapp::run(|| debug_json.clone())
345+
engine_debug_webapp::run(|| debug_json.clone())
344346
}
345347
Some(DebugEngineMode::File(_file)) if !backend.dry_run => {
346348
println!("{}", debug_json)

engine/utils/phase-debug-webapp/src/lib.rs cli/subcommands/src/engine_debug_webapp/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ pub fn run(get_json: impl Fn() -> String) {
2323
let ct_utf8 = Header::from_bytes(&b"charset"[..], &b"utf-8"[..]).unwrap();
2424
for request in server.incoming_requests() {
2525
let response = match request.url() {
26-
"/" => Response::from_string(include_str!("../static/index.html"))
26+
"/" => Response::from_string(include_str!("static/index.html"))
2727
.with_header(ct_html.clone())
2828
.with_header(ct_utf8.clone()),
29-
"/script.js" => Response::from_string(include_str!("../static/script.js"))
29+
"/script.js" => Response::from_string(include_str!("static/script.js"))
3030
.with_header(ct_js.clone())
3131
.with_header(ct_utf8.clone()),
3232
path if path.starts_with("/debug-hax-engine.json") => {

engine/dune-project

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
(name hax-engine)
44

5+
(version 0.1.0-alpha.1)
6+
57
(generate_opam_files true)
68

79
(source

engine/utils/phase-debug-webapp/Cargo.toml

-14
This file was deleted.

examples/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ resolver = "2"
1111
[workspace.dependencies]
1212
hax-lib-macros = { path = "../hax-lib-macros" }
1313
hax-lib = { path = "../hax-lib" }
14-
hax-bounded-integers = { path = "../hax-bounded-integers", version = "=0.1.0-pre.1" }
14+
hax-bounded-integers = { path = "../hax-bounded-integers" }
1515

flake.nix

+1
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
pkgs.ocamlPackages.utop
190190

191191
pkgs.cargo-expand
192+
pkgs.cargo-release
192193
pkgs.cargo-insta
193194
pkgs.openssl.dev
194195
pkgs.pkg-config

hax-bounded-integers/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ homepage.workspace = true
77
edition.workspace = true
88
repository.workspace = true
99
readme.workspace = true
10+
description = "Newtypes for working with bounded integers with hax"
1011

1112
[dependencies]
1213
duplicate = "1.0.0"

hax-types/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ homepage.workspace = true
77
edition.workspace = true
88
repository.workspace = true
99
readme.workspace = true
10+
description = "Helper crate defining the types used to communicate between the custom rustc driver, the CLI and the engine of hax."
1011

1112
[dependencies]
1213
clap = { workspace = true, features = ["env"] }

0 commit comments

Comments
 (0)