mirror of
https://github.com/tokio-rs/tokio.git
synced 2025-09-25 12:00:35 +00:00
ci: bump nightly to nightly-2024-05-05 (#6538)
This commit is contained in:
parent
b652a4e64c
commit
2a0df5fb05
@ -4,7 +4,7 @@ freebsd_instance:
|
|||||||
image_family: freebsd-14-0
|
image_family: freebsd-14-0
|
||||||
env:
|
env:
|
||||||
RUST_STABLE: stable
|
RUST_STABLE: stable
|
||||||
RUST_NIGHTLY: nightly-2023-10-21
|
RUST_NIGHTLY: nightly-2024-05-05
|
||||||
RUSTFLAGS: -D warnings
|
RUSTFLAGS: -D warnings
|
||||||
|
|
||||||
# Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the
|
# Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the
|
||||||
|
19
.github/workflows/ci.yml
vendored
19
.github/workflows/ci.yml
vendored
@ -15,7 +15,7 @@ env:
|
|||||||
RUST_BACKTRACE: 1
|
RUST_BACKTRACE: 1
|
||||||
# Change to specific Rust release to pin
|
# Change to specific Rust release to pin
|
||||||
rust_stable: stable
|
rust_stable: stable
|
||||||
rust_nightly: nightly-2023-10-21
|
rust_nightly: nightly-2024-05-05
|
||||||
rust_clippy: '1.77'
|
rust_clippy: '1.77'
|
||||||
# When updating this, also update:
|
# When updating this, also update:
|
||||||
# - README.md
|
# - README.md
|
||||||
@ -995,6 +995,23 @@ jobs:
|
|||||||
run: cargo check-external-types --all-features
|
run: cargo check-external-types --all-features
|
||||||
working-directory: tokio
|
working-directory: tokio
|
||||||
|
|
||||||
|
check-unexpected-lints-cfgs:
|
||||||
|
name: check unexpected lints and cfgs
|
||||||
|
needs: basics
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Install Rust ${{ env.rust_nightly }}
|
||||||
|
uses: dtolnay/rust-toolchain@master
|
||||||
|
with:
|
||||||
|
toolchain: ${{ env.rust_nightly }}
|
||||||
|
- name: don't allow warnings
|
||||||
|
run: sed -i '/#!\[allow(unknown_lints, unexpected_cfgs)\]/d' */src/lib.rs */tests/*.rs
|
||||||
|
- name: check for unknown lints and cfgs
|
||||||
|
run: cargo check --all-features --tests
|
||||||
|
env:
|
||||||
|
RUSTFLAGS: -Dwarnings --check-cfg=cfg(loom,tokio_unstable,tokio_taskdump,fuzzing,mio_unsupported_force_poll_poll,tokio_internal_mt_counters,fs,tokio_no_parking_lot,tokio_no_tuning_tests) -Funexpected_cfgs -Funknown_lints
|
||||||
|
|
||||||
check-fuzzing:
|
check-fuzzing:
|
||||||
name: check-fuzzing
|
name: check-fuzzing
|
||||||
needs: basics
|
needs: basics
|
||||||
|
9
target-specs/README.md
Normal file
9
target-specs/README.md
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
This is used for the `no-atomic-u64-test` ci check that verifies that Tokio
|
||||||
|
works even if the `AtomicU64` type is missing.
|
||||||
|
|
||||||
|
When increasing the nightly compiler version, you may need to regenerate this
|
||||||
|
target using the following command:
|
||||||
|
```
|
||||||
|
rustc +nightly -Z unstable-options --print target-spec-json --target i686-unknown-linux-gnu | grep -v 'is-builtin' | sed 's/"max-atomic-width": 64/"max-atomic-width": 32/' > target-specs/i686-unknown-linux-gnu.json
|
||||||
|
```
|
||||||
|
|
@ -1,29 +1,35 @@
|
|||||||
{
|
{
|
||||||
"arch": "x86",
|
"arch": "x86",
|
||||||
"cpu": "pentium4",
|
"cpu": "pentium4",
|
||||||
|
"crt-objects-fallback": "false",
|
||||||
"crt-static-respected": true,
|
"crt-static-respected": true,
|
||||||
"data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
|
"data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
|
||||||
"dynamic-linking": true,
|
"dynamic-linking": true,
|
||||||
"env": "gnu",
|
"env": "gnu",
|
||||||
"has-rpath": true,
|
"has-rpath": true,
|
||||||
"has-thread-local": true,
|
"has-thread-local": true,
|
||||||
|
"linker-flavor": "gnu-cc",
|
||||||
"llvm-target": "i686-unknown-linux-gnu",
|
"llvm-target": "i686-unknown-linux-gnu",
|
||||||
"max-atomic-width": 32,
|
"max-atomic-width": 32,
|
||||||
|
"metadata": {
|
||||||
|
"description": null,
|
||||||
|
"host_tools": null,
|
||||||
|
"std": null,
|
||||||
|
"tier": null
|
||||||
|
},
|
||||||
"os": "linux",
|
"os": "linux",
|
||||||
"position-independent-executables": true,
|
"position-independent-executables": true,
|
||||||
"pre-link-args": {
|
"pre-link-args": {
|
||||||
"gcc": [
|
"gnu-cc": [
|
||||||
|
"-m32"
|
||||||
|
],
|
||||||
|
"gnu-lld-cc": [
|
||||||
"-m32"
|
"-m32"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"relro-level": "full",
|
"relro-level": "full",
|
||||||
"stack-probes": {
|
"stack-probes": {
|
||||||
"kind": "inline-or-call",
|
"kind": "inline"
|
||||||
"min-llvm-version-for-inline": [
|
|
||||||
16,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"supported-sanitizers": [
|
"supported-sanitizers": [
|
||||||
"address"
|
"address"
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![allow(clippy::needless_doctest_main)]
|
#![allow(clippy::needless_doctest_main)]
|
||||||
#![warn(
|
#![warn(
|
||||||
missing_debug_implementations,
|
missing_debug_implementations,
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![allow(
|
#![allow(
|
||||||
clippy::cognitive_complexity,
|
clippy::cognitive_complexity,
|
||||||
clippy::large_enum_variant,
|
clippy::large_enum_variant,
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(
|
#![warn(
|
||||||
missing_debug_implementations,
|
missing_debug_implementations,
|
||||||
missing_docs,
|
missing_docs,
|
||||||
|
@ -639,7 +639,6 @@ mod builder {
|
|||||||
impl LengthFieldType for u64 {}
|
impl LengthFieldType for u64 {}
|
||||||
|
|
||||||
#[cfg(any(
|
#[cfg(any(
|
||||||
target_pointer_width = "8",
|
|
||||||
target_pointer_width = "16",
|
target_pointer_width = "16",
|
||||||
target_pointer_width = "32",
|
target_pointer_width = "32",
|
||||||
target_pointer_width = "64",
|
target_pointer_width = "64",
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![allow(clippy::needless_doctest_main)]
|
#![allow(clippy::needless_doctest_main)]
|
||||||
#![warn(
|
#![warn(
|
||||||
missing_debug_implementations,
|
missing_debug_implementations,
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(all(feature = "rt", tokio_unstable))]
|
#![cfg(all(feature = "rt", tokio_unstable))]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![allow(
|
#![allow(
|
||||||
clippy::cognitive_complexity,
|
clippy::cognitive_complexity,
|
||||||
clippy::large_enum_variant,
|
clippy::large_enum_variant,
|
||||||
@ -446,13 +447,9 @@
|
|||||||
// least 32 bits, which a lot of components in Tokio currently assumes.
|
// least 32 bits, which a lot of components in Tokio currently assumes.
|
||||||
//
|
//
|
||||||
// TODO: improve once we have MSRV access to const eval to make more flexible.
|
// TODO: improve once we have MSRV access to const eval to make more flexible.
|
||||||
#[cfg(not(any(
|
#[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
|
||||||
target_pointer_width = "32",
|
|
||||||
target_pointer_width = "64",
|
|
||||||
target_pointer_width = "128"
|
|
||||||
)))]
|
|
||||||
compile_error! {
|
compile_error! {
|
||||||
"Tokio requires the platform pointer width to be 32, 64, or 128 bits"
|
"Tokio requires the platform pointer width to be at least 32 bits"
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(
|
#[cfg(all(
|
||||||
|
@ -45,7 +45,9 @@
|
|||||||
use crate::sync::watch::Receiver;
|
use crate::sync::watch::Receiver;
|
||||||
use std::task::{Context, Poll};
|
use std::task::{Context, Poll};
|
||||||
|
|
||||||
|
#[cfg(feature = "signal")]
|
||||||
mod ctrl_c;
|
mod ctrl_c;
|
||||||
|
#[cfg(feature = "signal")]
|
||||||
pub use ctrl_c::ctrl_c;
|
pub use ctrl_c::ctrl_c;
|
||||||
|
|
||||||
pub(crate) mod registry;
|
pub(crate) mod registry;
|
||||||
|
@ -485,10 +485,12 @@ impl Signal {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Work around for abstracting streams internally
|
// Work around for abstracting streams internally
|
||||||
|
#[cfg(feature = "process")]
|
||||||
pub(crate) trait InternalStream {
|
pub(crate) trait InternalStream {
|
||||||
fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>>;
|
fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "process")]
|
||||||
impl InternalStream for Signal {
|
impl InternalStream for Signal {
|
||||||
fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
|
fn poll_recv(&mut self, cx: &mut Context<'_>) -> Poll<Option<()>> {
|
||||||
self.poll_recv(cx)
|
self.poll_recv(cx)
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
|
|
||||||
#[cfg(not(any(feature = "full", target_family = "wasm")))]
|
#[cfg(not(any(feature = "full", target_family = "wasm")))]
|
||||||
compile_error!("run main Tokio tests with `--features full`");
|
compile_error!("run main Tokio tests with `--features full`");
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![cfg(all(
|
#![cfg(all(
|
||||||
tokio_unstable,
|
tokio_unstable,
|
||||||
tokio_taskdump,
|
tokio_taskdump,
|
||||||
|
@ -55,8 +55,13 @@ async fn open_options_create_new() {
|
|||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
async fn open_options_mode() {
|
async fn open_options_mode() {
|
||||||
|
let mode = format!("{:?}", OpenOptions::new().mode(0o644));
|
||||||
// TESTING HACK: use Debug output to check the stored data
|
// TESTING HACK: use Debug output to check the stored data
|
||||||
assert!(format!("{:?}", OpenOptions::new().mode(0o644)).contains("mode: 420 "));
|
assert!(
|
||||||
|
mode.contains("mode: 420 ") || mode.contains("mode: 0o000644 "),
|
||||||
|
"mode is: {}",
|
||||||
|
mode
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![cfg(feature = "macros")]
|
#![cfg(feature = "macros")]
|
||||||
#![allow(clippy::disallowed_names)]
|
#![allow(clippy::disallowed_names)]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(feature = "full")]
|
#![cfg(feature = "full")]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![allow(clippy::needless_range_loop)]
|
#![allow(clippy::needless_range_loop)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(feature = "full")]
|
#![cfg(feature = "full")]
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(feature = "full")]
|
#![cfg(feature = "full")]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(all(feature = "full", tokio_unstable, not(target_os = "wasi")))]
|
#![cfg(all(feature = "full", tokio_unstable, not(target_os = "wasi")))]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(all(feature = "full", not(target_os = "wasi")))]
|
#![cfg(all(feature = "full", not(target_os = "wasi")))]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(all(feature = "full", not(target_os = "wasi")))]
|
#![cfg(all(feature = "full", not(target_os = "wasi")))]
|
||||||
#![cfg(tokio_unstable)]
|
#![cfg(tokio_unstable)]
|
||||||
|
@ -7,8 +7,10 @@ use tokio::time::Duration;
|
|||||||
|
|
||||||
use tokio::runtime::Builder;
|
use tokio::runtime::Builder;
|
||||||
|
|
||||||
|
#[cfg(panic = "unwind")]
|
||||||
struct PanicOnDrop;
|
struct PanicOnDrop;
|
||||||
|
|
||||||
|
#[cfg(panic = "unwind")]
|
||||||
impl Drop for PanicOnDrop {
|
impl Drop for PanicOnDrop {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
panic!("Well what did you expect would happen...");
|
panic!("Well what did you expect would happen...");
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![cfg(all(tokio_unstable, feature = "tracing"))]
|
#![cfg(all(tokio_unstable, feature = "tracing"))]
|
||||||
|
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(all(feature = "full", tokio_unstable))]
|
#![cfg(all(feature = "full", tokio_unstable))]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(feature = "full")]
|
#![cfg(feature = "full")]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![warn(rust_2018_idioms)]
|
#![warn(rust_2018_idioms)]
|
||||||
#![cfg(feature = "full")]
|
#![cfg(feature = "full")]
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#![allow(unknown_lints, unexpected_cfgs)]
|
||||||
#![cfg(all(feature = "full", tokio_unstable))]
|
#![cfg(all(feature = "full", tokio_unstable))]
|
||||||
|
|
||||||
use tokio::task;
|
use tokio::task;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user