Skip to content

Commit cb43382

Browse files
committed
ci: update Rust to 1.84.0
1 parent a9e177f commit cb43382

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Lint Rust
2525
runs-on: ubuntu-latest
2626
env:
27-
RUSTUP_TOOLCHAIN: 1.83.0
27+
RUSTUP_TOOLCHAIN: 1.84.0
2828
steps:
2929
- uses: actions/checkout@v4
3030
with:
@@ -97,11 +97,11 @@ jobs:
9797
matrix:
9898
include:
9999
- os: ubuntu-latest
100-
rust: 1.83.0
100+
rust: 1.84.0
101101
- os: windows-latest
102-
rust: 1.83.0
102+
rust: 1.84.0
103103
- os: macos-latest
104-
rust: 1.83.0
104+
rust: 1.84.0
105105

106106
# Minimum Supported Rust Version = 1.77.0
107107
- os: ubuntu-latest

scripts/coredeps/install-rust.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -euo pipefail
77
#
88
# Avoid using rustup here as it depends on reading /proc/self/exe and
99
# has problems running under QEMU.
10-
RUST_VERSION=1.83.0
10+
RUST_VERSION=1.84.0
1111

1212
ARCH="$(uname -m)"
1313
test -f "/lib/libc.musl-$ARCH.so.1" && LIBC=musl || LIBC=gnu

src/imap.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,10 +1589,8 @@ impl Session {
15891589
};
15901590

15911591
if self.can_metadata() && self.can_push() {
1592-
let device_token_changed = context
1593-
.get_config(Config::DeviceToken)
1594-
.await?
1595-
.map_or(true, |config_token| device_token != config_token);
1592+
let device_token_changed =
1593+
context.get_config(Config::DeviceToken).await?.as_ref() != Some(&device_token);
15961594

15971595
if device_token_changed {
15981596
let folder = context

0 commit comments

Comments
 (0)