Merge branch 'main' into interprocess

# Conflicts: # Cargo.lock # Cargo.toml
n0-computer · Aug 15, 2023 · 6a698e7 · 6a698e7
2 parents 520a122 + 0ccd8f5
commit 6a698e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -100,13 +100,13 @@ jobs:
       - name: cargo check
         run: cargo check --workspace --all-features --lib --bins
 
-  # minimal-crates:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - uses: dtolnay/rust-toolchain@nightly
-  #     - uses: swatinem/rust-cache@v2
-  #     - name: cargo check
-  #       run: |
-  #         rm -f Cargo.lock
-  #         cargo +nightly check -Z minimal-versions --workspace --all-features --lib --bins
+  minimal-crates:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: swatinem/rust-cache@v2
+      - name: cargo check
+        run: |
+          rm -f Cargo.lock
+          cargo +nightly check -Z minimal-versions --workspace --all-features --lib --bins
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,6 +50,7 @@ rustls = "0.21"
 thousands = "0.2.0"
 tracing-subscriber = "0.3.16"
 tempfile = "3.5.0"
+proc-macro2 = "1.0.66"
 
 [features]
 hyper-transport = ["flume", "hyper", "bincode", "bytes"]