chore: remove workspace-hack

spraakbanken · Sep 18, 2024 · 3f08c2e · 3f08c2e
1 parent a1f1e3c
commit 3f08c2e
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 272 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -6,110 +6,109 @@
 # - hack: check combinations of feature flags
 # - msrv: check that the msrv specified in the crate is correct
 permissions:
-    contents: read
+  contents: read
   # This configuration allows maintainers of this repo to create a branch and pull request based on
   # the new branch. Restricting the push trigger to the main branch ensures that the PR only gets
   # built once.
 on:
-    push:
-      branches: [main]
-    pull_request:
-    merge_group:
+  push:
+    branches: [main]
+  pull_request:
+  merge_group:
   # If new code is pushed to a PR branch, then cancel in progress workflows for that PR. Ensures that
   # we don't waste CI time, and returns results quicker https://github.com/jonhoo/rust-ci-conf/pull/5
 concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 name: check
 jobs:
-    fmt:
-      runs-on: ubuntu-latest
-      name: stable / fmt
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: true
-        - name: Install stable
-          uses: dtolnay/rust-toolchain@stable
-          with:
-            components: rustfmt
-        - name: cargo fmt --check
-          run: cargo fmt --check
-    clippy:
-      runs-on: ubuntu-latest
-      name: ${{ matrix.toolchain }} / clippy
-      permissions:
-        contents: read
-        checks: write
-      strategy:
-        fail-fast: false
-        matrix:
-          # Get early warning of new lints which are regularly introduced in beta channels.
-          toolchain: [stable, beta]
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: true
-        - name: Install ${{ matrix.toolchain }}
-          uses: dtolnay/rust-toolchain@master
-          with:
-            toolchain: ${{ matrix.toolchain }}
-            components: clippy
-        - name: cargo clippy
-          uses: giraffate/clippy-action@v1
-          with:
-            reporter: 'github-pr-check'
-            github_token: ${{ secrets.GITHUB_TOKEN }}
-    doc:
-      # run docs generation on nightly rather than stable. This enables features like
-      # https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an
-      # API be documented as only available in some specific platforms.
-      runs-on: ubuntu-latest
-      name: nightly / doc
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: true
-        - name: Install nightly
-          uses: dtolnay/rust-toolchain@nightly
-        - name: cargo doc
-          run: cargo doc --no-deps --all-features
-          env:
-            RUSTDOCFLAGS: --cfg docsrs
-    hack:
-      # cargo-hack checks combinations of feature flags to ensure that features are all additive
-      # which is required for feature unification
-      runs-on: ubuntu-latest
-      name: ubuntu / stable / features
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: true
-        - name: Install stable
-          uses: dtolnay/rust-toolchain@stable
-        - name: cargo install cargo-hack
-          uses: taiki-e/install-action@cargo-hack
-        # intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4
-        # --feature-powerset runs for every combination of features
-        - name: cargo hack
-          run: cargo hack --feature-powerset check
-    msrv:
-      # check that we can build using the minimal rust version that is specified by this crate
-      runs-on: ubuntu-latest
-      # we use a matrix here just because env can't be used in job names
-      # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
-      strategy:
-        matrix:
-          msrv: ["1.56.1"] # 2021 edition requires 1.56
-      name: ubuntu / ${{ matrix.msrv }}
-      steps:
-        - uses: actions/checkout@v4
-          with:
-            submodules: true
-        - name: Install ${{ matrix.msrv }}
-          uses: dtolnay/rust-toolchain@master
-          with:
-            toolchain: ${{ matrix.msrv }}
-        - name: cargo +${{ matrix.msrv }} check
-          run: cargo check
-
+  fmt:
+    runs-on: ubuntu-latest
+    name: stable / fmt
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - name: cargo fmt --check
+        run: cargo fmt --check
+  clippy:
+    runs-on: ubuntu-latest
+    name: ${{ matrix.toolchain }} / clippy
+    permissions:
+      contents: read
+      checks: write
+    strategy:
+      fail-fast: false
+      matrix:
+        # Get early warning of new lints which are regularly introduced in beta channels.
+        toolchain: [stable, beta]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install ${{ matrix.toolchain }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          components: clippy
+      - name: cargo clippy
+        uses: giraffate/clippy-action@v1
+        with:
+          reporter: "github-pr-check"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+  doc:
+    # run docs generation on nightly rather than stable. This enables features like
+    # https://doc.rust-lang.org/beta/unstable-book/language-features/doc-cfg.html which allows an
+    # API be documented as only available in some specific platforms.
+    runs-on: ubuntu-latest
+    name: nightly / doc
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install nightly
+        uses: dtolnay/rust-toolchain@nightly
+      - name: cargo doc
+        run: cargo doc --no-deps --all-features
+        env:
+          RUSTDOCFLAGS: --cfg docsrs
+  hack:
+    # cargo-hack checks combinations of feature flags to ensure that features are all additive
+    # which is required for feature unification
+    runs-on: ubuntu-latest
+    name: ubuntu / stable / features
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install stable
+        uses: dtolnay/rust-toolchain@stable
+      - name: cargo install cargo-hack
+        uses: taiki-e/install-action@cargo-hack
+      # intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4
+      # --feature-powerset runs for every combination of features
+      - name: cargo hack
+        run: cargo hack --feature-powerset check
+  msrv:
+    # check that we can build using the minimal rust version that is specified by this crate
+    runs-on: ubuntu-latest
+    # we use a matrix here just because env can't be used in job names
+    # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability
+    strategy:
+      matrix:
+        msrv: ["1.63"] # 2021 edition requires 1.56
+    name: ubuntu / ${{ matrix.msrv }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install ${{ matrix.msrv }}
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.msrv }}
+      - name: cargo +${{ matrix.msrv }} check
+        run: cargo check
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,6 @@ sblex-server = { path = "./crates/sblex-server" }
 sblex-telemetry = { path = "./crates/sblex-telemetry" }
 trie-map = { path = "./crates/trie-map" }
 trie-sketch = { path = "./crates/trie-sketch" }
-workspace-hack = { path = "./crates/workspace-hack" }
 
 # extern crates
 ahash = "0.8"

diff --git a/crates/fm-server/Cargo.toml b/crates/fm-server/Cargo.toml
@@ -48,7 +48,6 @@ uuid.workspace = true
 # local deps
 sblex.workspace = true
 sblex-telemetry.workspace = true
-workspace-hack.workspace = true
 
 # opentelemetry-stdout = { version = "0.3.0", features = [
 #     "trace",
@@ -63,6 +62,3 @@ workspace-hack.workspace = true
 eyre.workspace = true
 reqwest.workspace = true
 insta.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["workspace-hack"]
diff --git a/crates/sblex-server/Cargo.toml b/crates/sblex-server/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 # local deps
 sblex-telemetry.workspace = true
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 # external deps
 axum = { workspace = true }
@@ -31,6 +30,3 @@ tracing = { workspace = true }
 httpc-test = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 rstest = { workspace = true }
-
-[package.metadata.cargo-machete]
-ignored = ["workspace-hack"]
diff --git a/crates/sblex/Cargo.toml b/crates/sblex/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 
 [dependencies]
 # local deps
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
 # external deps
 arcstr = { workspace = true, features = ["serde"] }
@@ -19,6 +18,3 @@ unicode-segmentation = { workspace = true }
 
 [dev-dependencies]
 eyre = { workspace = true }
-
-[package.metadata.cargo-machete]
-ignored = ["workspace-hack"]
diff --git a/crates/trie-map/Cargo.toml b/crates/trie-map/Cargo.toml
@@ -9,7 +9,3 @@ edition = "2021"
 bytes.workspace = true
 
 # local deps
-workspace-hack.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["workspace-hack"]
diff --git a/crates/trie-sketch/Cargo.toml b/crates/trie-sketch/Cargo.toml
@@ -7,7 +7,3 @@ edition = "2021"
 
 [dependencies]
 # local deps
-workspace-hack.workspace = true
-
-[package.metadata.cargo-machete]
-ignored = ["workspace-hack"]
diff --git a/crates/workspace-hack/.gitattributes b/crates/workspace-hack/.gitattributes