Merge branch 'master' into duarte/blocking-metrics

tokio-rs · Nov 3, 2022 · 4dfe328 · 4dfe328
2 parents d2ba276 + df6348f
commit 4dfe328
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ env:
   RUST_BACKTRACE: 1
   # Change to specific Rust release to pin
   rust_stable: stable
-  rust_nightly: nightly-2022-07-26
+  rust_nightly: nightly-2022-11-03
   rust_clippy: 1.56.0
   # When updating this, also update:
   # - README.md
@@ -555,15 +555,17 @@ jobs:
           - ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Rust ${{ env.rust_nightly }}
+      - name: Install Rust nightly-2022-07-25
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ env.rust_nightly }}
+          # `check-external-types` requires a specific Rust nightly version. See
+          # the README for details: https://github.com/awslabs/cargo-check-external-types
+          toolchain: nightly-2022-07-25
           override: true
       - uses: Swatinem/rust-cache@v1
       - name: check-external-types
         run: |
           set -x
-          cargo install cargo-check-external-types --locked --version 0.1.3
+          cargo install cargo-check-external-types --locked --version 0.1.5
           cargo check-external-types --all-features --config external-types.toml
         working-directory: tokio
diff --git a/tokio/tests/macros_join.rs b/tokio/tests/macros_join.rs
@@ -81,7 +81,7 @@ fn join_size() {
         let ready2 = future::ready(0i32);
         tokio::join!(ready1, ready2)
     };
-    assert_eq!(mem::size_of_val(&fut), 48);
+    assert_eq!(mem::size_of_val(&fut), 40);
 }
 
 async fn non_cooperative_task(permits: Arc<Semaphore>) -> usize {