diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 717a28fd7..c2a1ebfdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: name: Lint Rust runs-on: ubuntu-latest env: - RUSTUP_TOOLCHAIN: 1.80.1 + RUSTUP_TOOLCHAIN: 1.81.0 steps: - uses: actions/checkout@v4 with: @@ -95,11 +95,11 @@ jobs: matrix: include: - os: ubuntu-latest - rust: 1.80.1 + rust: 1.81.0 - os: windows-latest - rust: 1.80.1 + rust: 1.81.0 - os: macos-latest - rust: 1.80.1 + rust: 1.81.0 # Minimum Supported Rust Version = 1.77.0 - os: ubuntu-latest diff --git a/scripts/coredeps/install-rust.sh b/scripts/coredeps/install-rust.sh index 8ece61d70..8fbabea0c 100755 --- a/scripts/coredeps/install-rust.sh +++ b/scripts/coredeps/install-rust.sh @@ -7,7 +7,7 @@ set -euo pipefail # # Avoid using rustup here as it depends on reading /proc/self/exe and # has problems running under QEMU. -RUST_VERSION=1.80.1 +RUST_VERSION=1.81.0 ARCH="$(uname -m)" test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu diff --git a/src/qr/dclogin_scheme.rs b/src/qr/dclogin_scheme.rs index cb705ae18..c8cece55d 100644 --- a/src/qr/dclogin_scheme.rs +++ b/src/qr/dclogin_scheme.rs @@ -72,7 +72,7 @@ pub(super) fn decode_login(qr: &str) -> Result { .unwrap_or(url_without_scheme); let addr = payload - .split(|c| c == '?' || c == '/') + .split(['?', '/']) .next() .context("invalid DCLOGIN payload E3")?; diff --git a/src/tools.rs b/src/tools.rs index 92b5deeda..d1ec13d6d 100644 --- a/src/tools.rs +++ b/src/tools.rs @@ -54,7 +54,7 @@ pub(crate) fn truncate(buf: &str, approx_chars: usize) -> Cow { .map(|(n, _)| n) .unwrap_or_default(); - if let Some(index) = buf[..end_pos].rfind(|c| c == ' ' || c == '\n') { + if let Some(index) = buf[..end_pos].rfind([' ', '\n']) { Cow::Owned(format!("{}{}", &buf[..=index], DC_ELLIPSIS)) } else { Cow::Owned(format!("{}{}", &buf[..end_pos], DC_ELLIPSIS)) @@ -98,7 +98,7 @@ pub(crate) fn truncate_by_lines( // Text has too many lines and needs to be truncated. let text = { if let Some(buffer) = buf.get(..end_pos) { - if let Some(index) = buffer.rfind(|c| c == ' ' || c == '\n') { + if let Some(index) = buffer.rfind([' ', '\n']) { buf.get(..=index) } else { buf.get(..end_pos)