OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2024-12-22 22:46:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update pinned nightly

Browse source
This commit is contained in:
Maybe Waffle 2023-05-29 18:28:54 +04:00
parent 8426ffac91
commit 4eb80e0640
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -19,7 +19,7 @@ env:
# When updating this, also update: # When updating this, also update:
# - crates/teloxide-core/src/codegen.rs # - crates/teloxide-core/src/codegen.rs
# - rust-toolchain.toml # - rust-toolchain.toml
rust_nightly: nightly-2022-12-23 rust_nightly: nightly-2023-05-28
# When updating this, also update: # When updating this, also update:
# - **/README.md # - **/README.md
# - **/src/lib.rs # - **/src/lib.rs
@ -88,7 +88,7 @@ jobs:
toolchain: beta toolchain: beta
features: "--features full" features: "--features full"
- rust: nightly - rust: nightly
toolchain: nightly-2022-12-23 toolchain: nightly-2023-05-28
features: "--features full nightly" features: "--features full nightly"
- rust: msrv - rust: msrv
toolchain: 1.64.0 toolchain: 1.64.0

4
crates/teloxide-core/src/codegen.rs
View file

@ -23,7 +23,7 @@ use xshell::{cmd, Shell};
fn ensure_rustfmt(sh: &Shell) { fn ensure_rustfmt(sh: &Shell) {
// FIXME(waffle): find a better way to set toolchain // FIXME(waffle): find a better way to set toolchain
let toolchain = "nightly-2022-12-23"; let toolchain = "nightly-2023-05-28";
let version = cmd!(sh, "rustup run {toolchain} rustfmt --version").read().unwrap_or_default(); 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 { pub fn reformat(text: String) -> String {
let toolchain = "nightly-2022-12-23"; let toolchain = "nightly-2023-05-28";
let sh = Shell::new().unwrap(); let sh = Shell::new().unwrap();
ensure_rustfmt(&sh); ensure_rustfmt(&sh);

7
crates/teloxide-core/src/net/download.rs
View file

@ -12,10 +12,9 @@ use tokio::io::{AsyncWrite, AsyncWriteExt};
use crate::{errors::DownloadError, net::file_url}; use crate::{errors::DownloadError, net::file_url};
/// A trait for downloading files from Telegram. /// A trait for downloading files from Telegram.
pub trait Download<'w> // FIXME(waffle): ideally, this lifetime ('w) shouldn't be here, but we can't
/* FIXME(waffle): ideally, this lifetime ('w) shouldn't be here, but we can't help it without // help it without GATs
* GATs */ pub trait Download<'w> {
{
/// An error returned from [`download_file`](Self::download_file). /// An error returned from [`download_file`](Self::download_file).
type Err; type Err;

2
rust-toolchain.toml
View file

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "nightly-2022-12-23" channel = "nightly-2023-05-28"
components = ["rustfmt", "clippy"] components = ["rustfmt", "clippy"]
profile = "minimal" profile = "minimal"