diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43502d8..fc0fb71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,24 +51,14 @@ jobs: uses: arduino/setup-protoc@v3 - name: Install latest nextest release uses: taiki-e/install-action@nextest - # - name: Build quick-junit - # run: cargo build --package quick-junit - # - name: Build nextest-metadata - # run: cargo build --package nextest-metadata - # - name: Build cargo-nextest without self-update - # run: cargo build --package cargo-nextest --no-default-features --features default-no-update - # - name: Build cargo-nextest - # run: cargo build --package cargo-nextest - # - name: Build all targets - # run: cargo build --all-targets - name: Build all targets with all features run: cargo build --all-targets --all-features - name: Doctests run: cargo test --doc - name: Test with latest nextest - run: cargo nextest run --profile ci + run: cargo nextest run - name: Test with miri - run: cargo nextest miri run --profile ci + run: cargo nextest miri run coverage: name: Collect test coverage diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml deleted file mode 100644 index f408774..0000000 --- a/.github/workflows/hakari.yml +++ /dev/null @@ -1,29 +0,0 @@ -on: - push: - branches: - - main - pull_request: - branches: - - main - -name: cargo hakari - -jobs: - workspace-hack-check: - name: Check workspace-hack - runs-on: ubuntu-latest - env: - RUSTFLAGS: -D warnings - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - - name: Install Protoc - uses: arduino/setup-protoc@v3 - - uses: dtolnay/rust-toolchain@nightly - - name: Install cargo-hakari - uses: taiki-e/install-action@715c07ff046a1badca82fa42e5708f37e405a997 # v2 - with: - tool: cargo-hakari - - name: Check workspace-hack Cargo.toml is up-to-date - run: cargo hakari generate --diff - - name: Check all crates depend on workspace-hack - run: cargo hakari manage-deps --dry-run \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 5553da6..09c23c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1176,7 +1176,6 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.52", - "workspace-hack 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1269,9 +1268,6 @@ dependencies = [ [[package]] name = "query_engine" version = "0.1.0" -dependencies = [ - "workspace-hack 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "quick-error" @@ -1441,7 +1437,6 @@ dependencies = [ "tonic", "tonic-build", "tracing", - "workspace-hack 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust", ] @@ -1599,7 +1594,6 @@ dependencies = [ "tokio", "tonic", "tonic-build", - "workspace-hack 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2164,38 +2158,6 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" -[[package]] -name = "workspace-hack" -version = "0.1.0" -dependencies = [ - "bitflags 2.4.2", - "bytes 1.5.0", - "either", - "indexmap 1.9.3", - "itertools", - "libc", - "log", - "memchr", - "petgraph", - "proc-macro2", - "prost", - "quote", - "regex", - "regex-automata", - "regex-syntax", - "serde", - "syn 1.0.109", - "syn 2.0.52", - "tokio", - "tokio-stream", -] - -[[package]] -name = "workspace-hack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01" - [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 2cfe73d..14ea5e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ members = [ "src/storage_engine", "src/runtime", "src/util/pro-macro", - "workspace-hack", "src/query_engine", ] diff --git a/src/query_engine/Cargo.toml b/src/query_engine/Cargo.toml index df1c4c0..1d365ab 100644 --- a/src/query_engine/Cargo.toml +++ b/src/query_engine/Cargo.toml @@ -3,5 +3,4 @@ name = "query_engine" version = "0.1.0" edition = "2021" -[dependencies] -workspace-hack.workspace = true \ No newline at end of file +[dependencies] \ No newline at end of file diff --git a/src/runtime/Cargo.toml b/src/runtime/Cargo.toml index 80925b6..adb5e9d 100644 --- a/src/runtime/Cargo.toml +++ b/src/runtime/Cargo.toml @@ -34,8 +34,6 @@ tempfile = "3.3.0" anyerror = "0.1.7" tracing = "0.1.36" storage_engine = { path = "../storage_engine"} -workspace-hack.workspace = true - [dev-dependencies] clap = { version = "3.2.16", features = ["derive"] } diff --git a/src/storage_engine/Cargo.toml b/src/storage_engine/Cargo.toml index 27ef5bf..b908ae6 100644 --- a/src/storage_engine/Cargo.toml +++ b/src/storage_engine/Cargo.toml @@ -32,7 +32,6 @@ tonic = "0.8.0" bytes = "1.5.0" prost = "0.11.0" blink-alloc = "0.3.1" -workspace-hack.workspace = true [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemallocator = "0.5" diff --git a/src/util/pro-macro/Cargo.toml b/src/util/pro-macro/Cargo.toml index e3f1d75..51e460b 100644 --- a/src/util/pro-macro/Cargo.toml +++ b/src/util/pro-macro/Cargo.toml @@ -10,4 +10,3 @@ proc-macro = true proc-macro2 = "1.0.78" quote = "1.0.35" syn = "2.0.52" -workspace-hack.workspace = true diff --git a/workspace-hack/.gitattributes b/workspace-hack/.gitattributes deleted file mode 100644 index 3e9dba4..0000000 --- a/workspace-hack/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks -# Cargo. -# Also do not check out the file as CRLF on Windows, as that's what hakari needs. -Cargo.toml merge=binary -crlf diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml deleted file mode 100644 index c1971eb..0000000 --- a/workspace-hack/Cargo.toml +++ /dev/null @@ -1,64 +0,0 @@ -# This file is generated by `cargo hakari`. -# To regenerate, run: -# cargo hakari generate - -[package] -name = "workspace-hack" -version = "0.1.0" -edition = "2021" -description = "workspace-hack package, managed by hakari" -# You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing. -publish = false - -# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments -# are managed by hakari. - -### BEGIN HAKARI SECTION -[dependencies] -bitflags = { version = "2.4.2", default-features = false, features = ["std"] } -bytes = { version = "1.5.0" } -either = { version = "1.10.0" } -indexmap = { version = "1.9.3", default-features = false, features = ["std"] } -itertools = { version = "0.10.5" } -log = { version = "0.4.21", default-features = false, features = ["std"] } -memchr = { version = "2.7.1" } -petgraph = { version = "0.6.4" } -proc-macro2 = { version = "1.0.78" } -prost = { version = "0.11.9" } -quote = { version = "1.0.35" } -regex = { version = "1.10.3" } -regex-automata = { version = "0.4.6", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } -regex-syntax = { version = "0.8.2" } -serde = { version = "1.0.197", features = ["derive"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "full", "visit"] } -tokio = { version = "1.36.0", features = ["full"] } -tokio-stream = { version = "0.1.14", features = ["net"] } - -[build-dependencies] -bitflags = { version = "2.4.2", default-features = false, features = ["std"] } -bytes = { version = "1.5.0" } -either = { version = "1.10.0" } -indexmap = { version = "1.9.3", default-features = false, features = ["std"] } -itertools = { version = "0.10.5" } -log = { version = "0.4.21", default-features = false, features = ["std"] } -memchr = { version = "2.7.1" } -petgraph = { version = "0.6.4" } -proc-macro2 = { version = "1.0.78" } -prost = { version = "0.11.9" } -quote = { version = "1.0.35" } -regex = { version = "1.10.3" } -regex-automata = { version = "0.4.6", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } -regex-syntax = { version = "0.8.2" } -serde = { version = "1.0.197", features = ["derive"] } -syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "full", "visit"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.52", features = ["extra-traits", "full", "visit-mut"] } -tokio = { version = "1.36.0", features = ["full"] } -tokio-stream = { version = "0.1.14", features = ["net"] } - -[target.x86_64-apple-darwin.dependencies] -libc = { version = "0.2.153", features = ["extra_traits"] } - -[target.x86_64-apple-darwin.build-dependencies] -libc = { version = "0.2.153", features = ["extra_traits"] } - -### END HAKARI SECTION diff --git a/workspace-hack/build.rs b/workspace-hack/build.rs deleted file mode 100644 index 92518ef..0000000 --- a/workspace-hack/build.rs +++ /dev/null @@ -1,2 +0,0 @@ -// A build script is required for cargo to consider build dependencies. -fn main() {} diff --git a/workspace-hack/src/lib.rs b/workspace-hack/src/lib.rs deleted file mode 100644 index 22489f6..0000000 --- a/workspace-hack/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// This is a stub lib.rs.