Skip to content

Commit

Permalink
Merge pull request #969 from hacspec/release-0.1.0-alpha
Browse files Browse the repository at this point in the history
Release `0.1.0-alpha.1`
  • Loading branch information
W95Psp authored Oct 7, 2024
2 parents 2b50069 + 8f7776b commit c37db7c
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 54 deletions.
39 changes: 16 additions & 23 deletions Cargo.lock

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

21 changes: 9 additions & 12 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 All @@ -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"
Expand Down Expand Up @@ -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" }
8 changes: 7 additions & 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 All @@ -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
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
2 changes: 2 additions & 0 deletions engine/dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

(name hax-engine)

(version 0.1.0-alpha.1)

(generate_opam_files true)

(source
Expand Down
14 changes: 0 additions & 14 deletions engine/utils/phase-debug-webapp/Cargo.toml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
pkgs.ocamlPackages.utop

pkgs.cargo-expand
pkgs.cargo-release
pkgs.cargo-insta
pkgs.openssl.dev
pkgs.pkg-config
Expand Down
1 change: 1 addition & 0 deletions hax-bounded-integers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions hax-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down

0 comments on commit c37db7c

Please sign in to comment.