Skip to content

Commit 742303c

Browse files
Bump rust-toolchain to rust 1.88 (#2749)
Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>
1 parent 666ade7 commit 742303c

File tree

146 files changed

+577
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+577
-557
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ jobs:
183183
runs-on: ubuntu-latest
184184
timeout-minutes: 20 # on a successful run, runs in 8 minutes
185185
container:
186-
image: rust:1.83.0
186+
image: rust:1.88.0
187187
options: --privileged
188188
# filter for a comment containing 'benchmarks please'
189189
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}

Cargo.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ debug = true
9191
version = "1.2.0"
9292
edition = "2021"
9393
# update rust-toolchain.toml too!
94-
rust-version = "1.84.0"
94+
rust-version = "1.88.0"
9595

9696
[workspace.dependencies]
9797
spacetimedb = { path = "crates/bindings", version = "1.2.0" }
@@ -326,3 +326,10 @@ features = [
326326
"broadcast",
327327
"ondemand",
328328
]
329+
330+
[workspace.lints.rust]
331+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
332+
333+
[workspace.lints.clippy]
334+
# FIXME: we should work on this lint incrementally
335+
result_large_err = "allow"

crates/auth/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ jsonwebtoken.workspace = true
1616

1717
[dev-dependencies]
1818
serde_json.workspace = true
19+
20+
[lints]
21+
workspace = true

crates/bench/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,6 @@ tikv-jemalloc-ctl = { workspace = true }
9090
iai-callgrind = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
9191
iai-callgrind-runner = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
9292
iai-callgrind-macros = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
93+
94+
[lints]
95+
workspace = true

crates/bench/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See the README for commands to run.
44

55
# sync with: ../../rust-toolchain.toml
6-
FROM rust:1.84.0
6+
FROM rust:1.88.0
77

88
RUN apt-get update && \
99
apt-get install -y valgrind bash && \

crates/bench/src/bin/summarize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mod criterion {
9999

100100
/// `"{crit_dir}/"{name}.json"`
101101
fn packed_baseline_json_path(crit_dir: &Path, name: &str) -> PathBuf {
102-
crit_dir.join(format!("{}.json", name))
102+
crit_dir.join(format!("{name}.json"))
103103
}
104104

105105
lazy_static::lazy_static! {
@@ -392,7 +392,7 @@ mod callgrind {
392392
}
393393

394394
fn packed_json_path(iai_callgrind_dir: &Path, name: &str) -> PathBuf {
395-
iai_callgrind_dir.join(format!("{}.json", name))
395+
iai_callgrind_dir.join(format!("{name}.json"))
396396
}
397397

398398
fn get_iai_callgrind_dir(target_dir: &Path) -> PathBuf {

crates/bench/src/spacetime_module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ impl<L: ModuleLanguage> BenchDatabase for SpacetimeModule<L> {
7070
});
7171

7272
for table in module.client.module.info.module_def.tables() {
73-
log::trace!("SPACETIME_MODULE: LOADED TABLE: {:?}", table);
73+
log::trace!("SPACETIME_MODULE: LOADED TABLE: {table:?}");
7474
}
7575
for reducer in module.client.module.info.module_def.reducers() {
76-
log::trace!("SPACETIME_MODULE: LOADED REDUCER: {:?}", reducer);
76+
log::trace!("SPACETIME_MODULE: LOADED REDUCER: {reducer:?}");
7777
}
7878
Ok(SpacetimeModule {
7979
runtime,

crates/bindings-macro/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ proc-macro2.workspace = true
1919
quote.workspace = true
2020
syn.workspace = true
2121
heck.workspace = true
22+
23+
[lints]
24+
workspace = true

crates/bindings-macro/src/table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ pub(crate) fn table_impl(mut args: TableArgs, item: &syn::DeriveInput) -> syn::R
800800
if std::env::var("PROC_MACRO_DEBUG").is_ok() {
801801
{
802802
#![allow(clippy::disallowed_macros)]
803-
println!("{}", emission);
803+
println!("{emission}");
804804
}
805805
}
806806

crates/bindings-macro/src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pub(crate) fn one_of(options: &[crate::sym::Symbol]) -> String {
7676
}
7777
_ => {
7878
let join = options.join("`, `");
79-
format!("expected one of: `{}`", join)
79+
format!("expected one of: `{join}`")
8080
}
8181
}
8282
}

0 commit comments

Comments
 (0)