Skip to content

Commit 3c745df

Browse files
authored
build: bump toolchain to 2024-06-12 (#17179)
Signed-off-by: xxchan <xxchan22f@gmail.com>
1 parent c09d264 commit 3c745df

59 files changed

Lines changed: 344 additions & 293 deletions

File tree

Some content is hidden

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

Cargo.lock

Lines changed: 16 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,16 @@ rw_iter_util = { path = "src/utils/iter_util" }
247247
[workspace.lints.rust]
248248
# `forbid` will also prevent the misuse of `#[allow(unused)]`
249249
unused_must_use = "forbid"
250-
future_incompatible = "warn"
251-
nonstandard_style = "warn"
252-
rust_2018_idioms = "warn"
250+
future_incompatible = { level = "warn", priority = -1 }
251+
nonstandard_style = { level = "warn", priority = -1 }
252+
rust_2018_idioms = { level = "warn", priority = -1 }
253253
# Backward compatibility is not important for an application.
254254
async_fn_in_trait = "allow"
255+
unexpected_cfgs = { level = "warn", check-cfg = [
256+
'cfg(madsim)',
257+
'cfg(coverage)',
258+
'cfg(dashboard_built)',
259+
] }
255260

256261
[workspace.lints.clippy]
257262
uninlined_format_args = "allow"

ci/build-ci-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cat ../rust-toolchain
1010
# shellcheck disable=SC2155
1111

1212
# REMEMBER TO ALSO UPDATE ci/docker-compose.yml
13-
export BUILD_ENV_VERSION=v20240729
13+
export BUILD_ENV_VERSION=v20240731
1414

1515
export BUILD_TAG="public.ecr.aws/w1p7b4n3/rw-build-env:${BUILD_ENV_VERSION}"
1616

ci/docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ services:
7171
retries: 5
7272

7373
source-test-env:
74-
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
74+
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240731
7575
depends_on:
7676
- mysql
7777
- db
@@ -84,7 +84,7 @@ services:
8484
- ..:/risingwave
8585

8686
sink-test-env:
87-
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
87+
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240731
8888
depends_on:
8989
- mysql
9090
- db
@@ -107,12 +107,12 @@ services:
107107

108108

109109
rw-build-env:
110-
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
110+
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240731
111111
volumes:
112112
- ..:/risingwave
113113

114114
ci-flamegraph-env:
115-
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
115+
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240731
116116
# NOTE(kwannoel): This is used in order to permit
117117
# syscalls for `nperf` (perf_event_open),
118118
# so it can do CPU profiling.
@@ -123,7 +123,7 @@ services:
123123
- ..:/risingwave
124124

125125
regress-test-env:
126-
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240729
126+
image: public.ecr.aws/w1p7b4n3/rw-build-env:v20240731
127127
depends_on:
128128
db:
129129
condition: service_healthy

ci/rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# 3. (optional) **follow the instructions in lints/README.md** to update the toolchain and dependencies for lints
55

66
[toolchain]
7-
channel = "nightly-2024-03-12"
7+
channel = "nightly-2024-06-06"

ci/scripts/build-other.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -euo pipefail
55

66
source ci/scripts/common.sh
77

8-
98
echo "--- Build Rust UDF"
109
cd e2e_test/udf/wasm
10+
rustup target add wasm32-wasi
1111
cargo build --release
1212
cd ../../..
1313

clippy.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ doc-valid-idents = [
3939
avoid-breaking-exported-api = false
4040
upper-case-acronyms-aggressive = true
4141
too-many-arguments-threshold = 10
42+
ignore-interior-mutability = [
43+
"risingwave_frontend::expr::ExprImpl" # XXX: Where does ExprImpl have interior mutability?
44+
]

e2e_test/source_inline/pubsub/prepare-data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env -S cargo -Zscript
2-
```cargo
2+
---cargo
33
[dependencies]
44
anyhow = "1"
55
google-cloud-googleapis = { version = "0.13", features = ["pubsub"] }
@@ -13,7 +13,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
1313
"signal",
1414
"fs",
1515
] }
16-
```
16+
---
1717

1818
use google_cloud_googleapis::pubsub::v1::PubsubMessage;
1919
use google_cloud_pubsub::client::{Client, ClientConfig};

lints/Cargo.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lints/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ path = "ui/format_error.rs"
1414
# See `README.md` before bumping the version.
1515
# Remember to update the version in `ci/Dockerfile` as well.
1616
[dependencies]
17-
clippy_utils = { git = "https://github.com/rust-lang/rust-clippy", rev = "fca4e16ffb8c07186ee23becd44cd5c9fb51896c" }
17+
clippy_utils = { git = "https://github.com/risingwavelabs/clippy", rev = "5e2a7c6adebdb0478ee6d5b67ab4ee94153b2997" }
1818
dylint_linting = "3.1.0"
1919
itertools = "0.12"
2020

0 commit comments

Comments
 (0)