From 04df142191473c23f467dca5f9567d223b5e1e0a Mon Sep 17 00:00:00 2001 From: Maybe Waffle Date: Wed, 27 Sep 2023 12:27:30 +0400 Subject: [PATCH] Update nightly rust used for development and CI --- .github/workflows/ci.yml | 4 ++-- crates/teloxide-core/src/codegen.rs | 4 ++-- rust-toolchain.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18852b28..5f6d1d79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ env: # When updating this, also update: # - crates/teloxide-core/src/codegen.rs # - rust-toolchain.toml - rust_nightly: nightly-2023-05-28 + rust_nightly: nightly-2023-09-27 # When updating this, also update: # - **/README.md # - **/src/lib.rs @@ -84,7 +84,7 @@ jobs: toolchain: beta features: "--features full" - rust: nightly - toolchain: nightly-2023-05-28 + toolchain: nightly-2023-09-27 features: "--features full nightly" - rust: msrv toolchain: 1.65.0 diff --git a/crates/teloxide-core/src/codegen.rs b/crates/teloxide-core/src/codegen.rs index afde1663..f14d3f62 100644 --- a/crates/teloxide-core/src/codegen.rs +++ b/crates/teloxide-core/src/codegen.rs @@ -23,7 +23,7 @@ use xshell::{cmd, Shell}; fn ensure_rustfmt(sh: &Shell) { // FIXME(waffle): find a better way to set toolchain - let toolchain = "nightly-2023-05-28"; + let toolchain = "nightly-2023-09-27"; let version = cmd!(sh, "rustup run {toolchain} rustfmt --version").read().unwrap_or_default(); @@ -36,7 +36,7 @@ fn ensure_rustfmt(sh: &Shell) { } pub fn reformat(text: String) -> String { - let toolchain = "nightly-2023-05-28"; + let toolchain = "nightly-2023-09-27"; let sh = Shell::new().unwrap(); ensure_rustfmt(&sh); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c58ff624..0c8b465f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2023-05-28" +channel = "nightly-2023-09-27" components = ["rustfmt", "clippy"] profile = "minimal"