From e15806f60d7aeea7b2df5a7fc434ceb966b99774 Mon Sep 17 00:00:00 2001 From: Romain Ruetschi Date: Wed, 22 Nov 2023 09:40:22 +0100 Subject: [PATCH] Move crate to root directory --- .github/workflows/coverage.yml | 9 +------- .github/workflows/publish.yml | 2 +- Cargo.toml | 23 +++++++++++++++---- {itf/examples => examples}/cannibals.rs | 0 itf/Cargo.toml | 19 --------------- {itf/src => src}/de.rs | 0 {itf/src => src}/de/deserializer.rs | 0 {itf/src => src}/de/error.rs | 0 {itf/src => src}/de/helpers.rs | 0 {itf/src => src}/error.rs | 0 {itf/src => src}/lib.rs | 2 +- {itf/src => src}/state.rs | 0 {itf/src => src}/trace.rs | 0 {itf/src => src}/value.rs | 0 {itf/src => src}/value/bigint.rs | 0 {itf/src => src}/value/map.rs | 0 {itf/src => src}/value/set.rs | 0 {itf/src => src}/value/tuple.rs | 0 {itf/src => src}/value/unserializable.rs | 0 {itf/tests => tests}/decide_non_proposer.rs | 0 .../fixtures/DecideNonProposerTest0.itf.json | 0 .../MissionariesAndCannibals.itf.json | 0 .../TestInsufficientSuccess9.itf.json | 0 {itf/tests => tests}/insufficient_success.rs | 0 .../missionaries_and_cannibals.rs | 0 {itf/tests => tests}/regression.rs | 0 26 files changed, 21 insertions(+), 34 deletions(-) rename {itf/examples => examples}/cannibals.rs (100%) delete mode 100644 itf/Cargo.toml rename {itf/src => src}/de.rs (100%) rename {itf/src => src}/de/deserializer.rs (100%) rename {itf/src => src}/de/error.rs (100%) rename {itf/src => src}/de/helpers.rs (100%) rename {itf/src => src}/error.rs (100%) rename {itf/src => src}/lib.rs (97%) rename {itf/src => src}/state.rs (100%) rename {itf/src => src}/trace.rs (100%) rename {itf/src => src}/value.rs (100%) rename {itf/src => src}/value/bigint.rs (100%) rename {itf/src => src}/value/map.rs (100%) rename {itf/src => src}/value/set.rs (100%) rename {itf/src => src}/value/tuple.rs (100%) rename {itf/src => src}/value/unserializable.rs (100%) rename {itf/tests => tests}/decide_non_proposer.rs (100%) rename {itf/tests => tests}/fixtures/DecideNonProposerTest0.itf.json (100%) rename {itf/tests => tests}/fixtures/MissionariesAndCannibals.itf.json (100%) rename {itf/tests => tests}/fixtures/TestInsufficientSuccess9.itf.json (100%) rename {itf/tests => tests}/insufficient_success.rs (100%) rename {itf/tests => tests}/missionaries_and_cannibals.rs (100%) rename {itf/tests => tests}/regression.rs (100%) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 58f3e22..d81139f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -3,18 +3,11 @@ name: Coverage on: push: branches: main - paths: - - itf/** pull_request: - paths: - - itf/** jobs: coverage: runs-on: ubuntu-latest - defaults: - run: - working-directory: itf env: CARGO_TERM_COLOR: always steps: @@ -37,5 +30,5 @@ jobs: uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_TOKEN }} - files: itf/lcov.info + files: lcov.info fail_ci_if_error: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 20bf1e9..a9eb6ed 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: tags: - - "v[0-9]+.[0-9]+.[0-9]+" # Push events to matching v*, i.e. v0.26.0, v1.0.0 + - "v[0-9]+.*" jobs: publish: diff --git a/Cargo.toml b/Cargo.toml index 54a3f2e..51c814c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,19 @@ -[workspace] -resolver = "2" +[package] +name = "itf" +version = "0.2.0" +edition = "2021" +license = "Apache-2.0" +readme = "README.md" +authors = ["Informal Systems "] +keywords = ["apalache", "serialization", "trace"] +description = "Library for consuming Apalache ITF traces" +repository = "https://github.com/informalsystems/itf-rs" +documentation = "https://docs.rs/itf" +rust-version = "1.65" -members = [ - "itf", -] +[dependencies] +num-bigint = { version = "0.4", features = ["serde"] } +num-traits = { version = "0.2" } +serde = { version = "1", features = ["derive"] } +serde_json = { version = "1", features = ["raw_value"] } +serde_with = { version = "3.4.0" } diff --git a/itf/examples/cannibals.rs b/examples/cannibals.rs similarity index 100% rename from itf/examples/cannibals.rs rename to examples/cannibals.rs diff --git a/itf/Cargo.toml b/itf/Cargo.toml deleted file mode 100644 index 12b7995..0000000 --- a/itf/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "itf" -version = "0.2.0" -edition = "2021" -license = "Apache-2.0" -readme = "../README.md" -authors = ["Informal Systems "] -keywords = ["apalache", "serialization", "trace"] -description = "Library for consuming Apalache ITF traces" -repository = "https://github.com/informalsystems/itf-rs" -documentation = "https://docs.rs/itf" -rust-version = "1.65" - -[dependencies] -num-bigint = { version = "0.4", features = ["serde"] } -num-traits = { version = "0.2" } -serde = { version = "1", features = ["derive"] } -serde_json = { version = "1", features = ["raw_value"] } -serde_with = { version = "3.4.0" } diff --git a/itf/src/de.rs b/src/de.rs similarity index 100% rename from itf/src/de.rs rename to src/de.rs diff --git a/itf/src/de/deserializer.rs b/src/de/deserializer.rs similarity index 100% rename from itf/src/de/deserializer.rs rename to src/de/deserializer.rs diff --git a/itf/src/de/error.rs b/src/de/error.rs similarity index 100% rename from itf/src/de/error.rs rename to src/de/error.rs diff --git a/itf/src/de/helpers.rs b/src/de/helpers.rs similarity index 100% rename from itf/src/de/helpers.rs rename to src/de/helpers.rs diff --git a/itf/src/error.rs b/src/error.rs similarity index 100% rename from itf/src/error.rs rename to src/error.rs diff --git a/itf/src/lib.rs b/src/lib.rs similarity index 97% rename from itf/src/lib.rs rename to src/lib.rs index 3f2ae27..e7b849b 100644 --- a/itf/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -#![doc = include_str!("../../README.md")] +#![doc = include_str!("../README.md")] use serde::de::DeserializeOwned; use serde::Deserialize; diff --git a/itf/src/state.rs b/src/state.rs similarity index 100% rename from itf/src/state.rs rename to src/state.rs diff --git a/itf/src/trace.rs b/src/trace.rs similarity index 100% rename from itf/src/trace.rs rename to src/trace.rs diff --git a/itf/src/value.rs b/src/value.rs similarity index 100% rename from itf/src/value.rs rename to src/value.rs diff --git a/itf/src/value/bigint.rs b/src/value/bigint.rs similarity index 100% rename from itf/src/value/bigint.rs rename to src/value/bigint.rs diff --git a/itf/src/value/map.rs b/src/value/map.rs similarity index 100% rename from itf/src/value/map.rs rename to src/value/map.rs diff --git a/itf/src/value/set.rs b/src/value/set.rs similarity index 100% rename from itf/src/value/set.rs rename to src/value/set.rs diff --git a/itf/src/value/tuple.rs b/src/value/tuple.rs similarity index 100% rename from itf/src/value/tuple.rs rename to src/value/tuple.rs diff --git a/itf/src/value/unserializable.rs b/src/value/unserializable.rs similarity index 100% rename from itf/src/value/unserializable.rs rename to src/value/unserializable.rs diff --git a/itf/tests/decide_non_proposer.rs b/tests/decide_non_proposer.rs similarity index 100% rename from itf/tests/decide_non_proposer.rs rename to tests/decide_non_proposer.rs diff --git a/itf/tests/fixtures/DecideNonProposerTest0.itf.json b/tests/fixtures/DecideNonProposerTest0.itf.json similarity index 100% rename from itf/tests/fixtures/DecideNonProposerTest0.itf.json rename to tests/fixtures/DecideNonProposerTest0.itf.json diff --git a/itf/tests/fixtures/MissionariesAndCannibals.itf.json b/tests/fixtures/MissionariesAndCannibals.itf.json similarity index 100% rename from itf/tests/fixtures/MissionariesAndCannibals.itf.json rename to tests/fixtures/MissionariesAndCannibals.itf.json diff --git a/itf/tests/fixtures/TestInsufficientSuccess9.itf.json b/tests/fixtures/TestInsufficientSuccess9.itf.json similarity index 100% rename from itf/tests/fixtures/TestInsufficientSuccess9.itf.json rename to tests/fixtures/TestInsufficientSuccess9.itf.json diff --git a/itf/tests/insufficient_success.rs b/tests/insufficient_success.rs similarity index 100% rename from itf/tests/insufficient_success.rs rename to tests/insufficient_success.rs diff --git a/itf/tests/missionaries_and_cannibals.rs b/tests/missionaries_and_cannibals.rs similarity index 100% rename from itf/tests/missionaries_and_cannibals.rs rename to tests/missionaries_and_cannibals.rs diff --git a/itf/tests/regression.rs b/tests/regression.rs similarity index 100% rename from itf/tests/regression.rs rename to tests/regression.rs