build: bump toolchain to 2023-09-09 (#11809)

Signed-off-by: TennyZhuang <[email protected]> Signed-off-by: MrCroxx <[email protected]> Co-authored-by: TennyZhuang <[email protected]> Co-authored-by: MrCroxx <[email protected]> Co-authored-by: William Wen <[email protected]> Co-authored-by: xxchan <[email protected]>
risingwavelabs · Sep 9, 2023 · f649aa6 · f649aa6
1 parent 6806eca
commit f649aa6
Show file tree

Hide file tree

Showing 260 changed files with 745 additions and 569 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -37,23 +37,8 @@ rustflags = [
     # uncomment the following two lines to enable `TaskLocalAlloc`
     # "--cfg",
     # "enable_task_local_alloc",
-    # lints
-    # TODO: use lint configuration in cargo https://github.com/rust-lang/cargo/issues/5034
-    "-Funused_must_use",
-    "-Aclippy::uninlined_format_args",
-    "-Wclippy::dbg_macro",
-    "-Wclippy::disallowed_methods",
-    "-Wclippy::disallowed_types",
-    "-Wclippy::doc_markdown",
-    "-Wclippy::explicit_into_iter_loop",
-    "-Wclippy::explicit_iter_loop",
-    "-Wclippy::inconsistent_struct_constructor",
-    "-Wclippy::unused_async",
-    "-Wclippy::map_flatten",
-    "-Wclippy::no_effect_underscore_binding",
-    "-Wclippy::await_holding_lock",
-    "-Wrustdoc::broken_intra_doc_links",
-    "-Wfuture_incompatible",
-    "-Wnonstandard_style",
-    "-Wrust_2018_idioms",
+
 ]
+
+[unstable]
+lints = true
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -61,22 +61,48 @@ repository = "https://github.com/risingwavelabs/risingwave"
 
 [workspace.dependencies]
 await-tree = "0.1.1"
-aws-config = { version = "0.55", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-credential-types = { version = "0.55", default-features = false, features = ["hardcoded-credentials"] }
-aws-sdk-kinesis = { version = "0.28", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-sdk-s3 = { version = "0.28", default-features = false, features = ["rt-tokio","native-tls"] }
-aws-sdk-ec2 = { version = "0.28", default-features = false, features = ["rt-tokio","native-tls"] }
-aws-sdk-sqs = { version = "0.28", default-features = false, features = ["rt-tokio", "native-tls"] }
-aws-smithy-client = { version = "0.55", default-features = false, features = ["rt-tokio", "native-tls"] }
+aws-config = { version = "0.55", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
+aws-credential-types = { version = "0.55", default-features = false, features = [
+  "hardcoded-credentials",
+] }
+aws-sdk-kinesis = { version = "0.28", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
+aws-sdk-s3 = { version = "0.28", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
+aws-sdk-ec2 = { version = "0.28", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
+aws-sdk-sqs = { version = "0.28", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
+aws-smithy-client = { version = "0.55", default-features = false, features = [
+  "rt-tokio",
+  "native-tls",
+] }
 aws-smithy-http = "0.55"
 aws-smithy-types = "0.55"
 aws-endpoint = "0.55"
 aws-types = "0.55"
 etcd-client = { package = "madsim-etcd-client", version = "0.3" }
 futures-async-stream = "0.2"
 hytra = "0.1"
-rdkafka = { package = "madsim-rdkafka", git = "https://github.com/madsim-rs/madsim.git", rev = "bb8f063", features = ["cmake-build"] }
-hashbrown = { version = "0.14.0", features = ["ahash", "inline-more", "nightly"] }
+rdkafka = { package = "madsim-rdkafka", git = "https://github.com/madsim-rs/madsim.git", rev = "bb8f063", features = [
+  "cmake-build",
+] }
+hashbrown = { version = "0.14.0", features = [
+  "ahash",
+  "inline-more",
+  "nightly",
+] }
 criterion = { version = "0.5", features = ["async_futures"] }
 tonic = { package = "madsim-tonic", version = "0.3.1" }
 tonic-build = { package = "madsim-tonic-build", version = "0.3.1" }
@@ -117,6 +143,32 @@ risingwave_variables = { path = "./src/utils/variables" }
 risingwave_java_binding = { path = "./src/java_binding" }
 risingwave_jni_core = { path = "src/jni_core" }
 
+[workspace.lints.rust]
+# `forbid` will also prevent the misuse of `#[allow(unused)]`
+unused_must_use = "forbid"
+future_incompatible = "warn"
+nonstandard_style = "warn"
+rust_2018_idioms = "warn"
+
+[workspace.lints.clippy]
+uninlined_format_args = "allow"
+dbg_macro = "warn"
+disallowed_methods = "warn"
+disallowed_types = "warn"
+doc_markdown = "warn"
+explicit_into_iter_loop = "warn"
+explicit_iter_loop = "warn"
+inconsistent_struct_constructor = "warn"
+unused_async = "warn"
+map_flatten = "warn"
+no_effect_underscore_binding = "warn"
+await_holding_lock = "warn"
+
+[workspace.lints.rustdoc]
+private_intra_doc_links = "allow"
+# Explicit lints don't hurt, and sometimes rust-analyzer works better with explicit links.
+redundant_explicit_links = "allow"
+
 [profile.dev]
 lto = 'off'
 

diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh
@@ -13,7 +13,7 @@ cat ../rust-toolchain
 # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
 #          AND ALSO docker-compose.yml               #
 ######################################################
-export BUILD_ENV_VERSION=v20230821
+export BUILD_ENV_VERSION=v20230909
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       retries: 5
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230821
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909
     depends_on:
       - mysql
       - db
@@ -81,7 +81,7 @@ services:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230821
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909
     depends_on:
       - mysql
       - db
@@ -91,12 +91,12 @@ services:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230821
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909
     volumes:
       - ..:/risingwave
 
   ci-flamegraph-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230821
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909
     # NOTE(kwannoel): This is used in order to permit
     # syscalls for `nperf` (perf_event_open),
     # so it can do CPU profiling.
@@ -107,7 +107,7 @@ services:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230821
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230909
     depends_on:
       db:
         condition: service_healthy

diff --git a/ci/rust-toolchain b/ci/rust-toolchain
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-05-31"
+channel = "nightly-2023-09-09"
diff --git a/ci/scripts/check.sh b/ci/scripts/check.sh
@@ -35,7 +35,7 @@ sccache --show-stats
 sccache --zero-stats
 
 echo "--- Build documentation"
-RUSTDOCFLAGS="-Dwarnings -Arustdoc::private_intra_doc_links" cargo doc --document-private-items --no-deps
+RUSTDOCFLAGS="-Dwarnings" cargo doc --document-private-items --no-deps
 
 echo "--- Show sccache stats"
 sccache --show-stats

diff --git a/ci/scripts/gen-flamegraph.sh b/ci/scripts/gen-flamegraph.sh
@@ -6,6 +6,8 @@ set -euo pipefail
 
 source ci/scripts/common.sh
 
+RUST_TOOLCHAIN=$(cat rust-toolchain)
+
 QUERY_DIR="/risingwave/ci/scripts/sql/nexmark"
 
 # TODO(kwannoel): This is a workaround since workdir is `/risingwave` in the docker container.
@@ -79,7 +81,7 @@ install_all() {
   git clone https://github.com/gimli-rs/addr2line
   pushd addr2line
   git checkout 0.20.0
-  echo "nightly-2023-04-07" > rust-toolchain
+  echo "$RUST_TOOLCHAIN" > rust-toolchain
   cargo b --examples -r
   mv ./target/release/examples/addr2line $(which addr2line)
   popd

diff --git a/integration_tests/feature-store/server/Cargo.toml b/integration_tests/feature-store/server/Cargo.toml
@@ -26,3 +26,6 @@ tonic-build = "0.7.1"
 [[bin]]
 name = "server"
 path = "src/main.rs"
+
+[lints]
+workspace = true
diff --git a/integration_tests/feature-store/simulator/Cargo.toml b/integration_tests/feature-store/simulator/Cargo.toml
@@ -20,3 +20,6 @@ prost = "0.10"
 serde = { version = "1", features = ["derive"] }
 futures = "0.3.0"
 csv = "1.2.2"
+
+[lints]
+workspace = true
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -9,4 +9,7 @@ group_imports = "StdExternalCrate"
 reorder_impl_items = true
 reorder_imports = true
 tab_spaces = 4
-wrap_comments = true
+# TODO: Fix it later. It produces too many unwanted changes related with markdown lists now. e.g.,
+# https://github.com/rust-lang/rustfmt/issues/5862
+# https://github.com/rust-lang/rustfmt/issues/5836
+# wrap_comments = true
diff --git a/scripts/source/prepare_ci_pubsub/Cargo.toml b/scripts/source/prepare_ci_pubsub/Cargo.toml
@@ -23,3 +23,6 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
     "signal",
     "fs",
 ] }
+
+[lints]
+workspace = true
diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml
@@ -100,3 +100,6 @@ harness = false
 [[bench]]
 name = "limit"
 harness = false
+
+[lints]
+workspace = true
diff --git a/src/batch/benches/expand.rs b/src/batch/benches/expand.rs
@@ -44,7 +44,7 @@ fn bench_expand(c: &mut Criterion) {
                 let chunk_num = SIZE / chunk_size;
                 b.to_async(&rt).iter_batched(
                     || create_expand_executor(vec![vec![0, 1], vec![2]], chunk_size, chunk_num),
-                    |e| execute_executor(e),
+                    execute_executor,
                     BatchSize::SmallInput,
                 );
             },

diff --git a/src/batch/benches/filter.rs b/src/batch/benches/filter.rs
@@ -46,7 +46,7 @@ fn bench_filter(c: &mut Criterion) {
                 let chunk_num = TOTAL_SIZE / chunk_size;
                 b.to_async(&rt).iter_batched(
                     || create_filter_executor(chunk_size, chunk_num),
-                    |e| execute_executor(e),
+                    execute_executor,
                     BatchSize::SmallInput,
                 );
             },

diff --git a/src/batch/benches/hash_agg.rs b/src/batch/benches/hash_agg.rs
@@ -142,7 +142,7 @@ fn bench_hash_agg(c: &mut Criterion) {
                                 chunk_num,
                             )
                         },
-                        |e| execute_executor(e),
+                        execute_executor,
                         BatchSize::SmallInput,
                     );
                 },

diff --git a/src/batch/benches/limit.rs b/src/batch/benches/limit.rs
@@ -51,7 +51,7 @@ fn bench_limit(c: &mut Criterion) {
                 let chunk_num = SIZE / chunk_size;
                 b.to_async(&rt).iter_batched(
                     || create_limit_executor(chunk_size, chunk_num, 128, 128),
-                    |e| execute_executor(e),
+                    execute_executor,
                     BatchSize::SmallInput,
                 );
             },

diff --git a/src/batch/benches/sort.rs b/src/batch/benches/sort.rs
@@ -80,7 +80,7 @@ fn bench_order_by(c: &mut Criterion) {
                     let chunk_num = SIZE / chunk_size;
                     b.to_async(&rt).iter_batched(
                         || create_order_by_executor(chunk_size, chunk_num, single_column),
-                        |e| execute_executor(e),
+                        execute_executor,
                         BatchSize::SmallInput,
                     );
                 },

diff --git a/src/batch/benches/top_n.rs b/src/batch/benches/top_n.rs
@@ -85,7 +85,7 @@ fn bench_top_n(c: &mut Criterion) {
                     let chunk_num = SIZE / chunk_size;
                     b.to_async(&rt).iter_batched(
                         || create_top_n_executor(chunk_size, chunk_num, single_column, 128, 128),
-                        |e| execute_executor(e),
+                        execute_executor,
                         BatchSize::SmallInput,
                     );
                 },

diff --git a/src/batch/benches/utils/mod.rs b/src/batch/benches/utils/mod.rs
@@ -53,7 +53,7 @@ pub fn bench_join(
                                     right_chunk_num,
                                 )
                             },
-                            |e| execute_executor(e),
+                            execute_executor,
                             BatchSize::SmallInput,
                         );
                     },

diff --git a/src/batch/src/executor/group_top_n.rs b/src/batch/src/executor/group_top_n.rs
@@ -217,7 +217,7 @@ impl<K: HashKey> GroupTopNExecutor<K> {
         }
 
         let mut chunk_builder = DataChunkBuilder::new(self.schema.data_types(), self.chunk_size);
-        for (_, h) in groups.iter_mut() {
+        for (_, h) in &mut groups {
             let mut heap = TopNHeap::empty();
             swap(&mut heap, h);
             for ele in heap.dump() {
@@ -308,7 +308,7 @@ mod tests {
             let mut stream = top_n_executor.execute();
             let res = stream.next().await;
 
-            assert!(matches!(res, Some(_)));
+            assert!(res.is_some());
             if let Some(res) = res {
                 let res = res.unwrap();
                 assert!(
@@ -338,7 +338,7 @@ mod tests {
             }
 
             let res = stream.next().await;
-            assert!(matches!(res, None));
+            assert!(res.is_none());
         }
 
         assert_eq!(0, parent_mem.get_bytes_used());

diff --git a/src/batch/src/executor/merge_sort_exchange.rs b/src/batch/src/executor/merge_sort_exchange.rs
@@ -329,7 +329,7 @@ mod tests {
 
         let mut stream = executor.execute();
         let res = stream.next().await;
-        assert!(matches!(res, Some(_)));
+        assert!(res.is_some());
         if let Some(res) = res {
             let res = res.unwrap();
             assert_eq!(res.capacity(), 3 * num_sources);

diff --git a/src/batch/src/executor/order_by.rs b/src/batch/src/executor/order_by.rs
@@ -196,7 +196,7 @@ mod tests {
 
         let mut stream = order_by_executor.execute();
         let res = stream.next().await;
-        assert!(matches!(res, Some(_)));
+        assert!(res.is_some());
         if let Some(res) = res {
             let res = res.unwrap();
             let col0 = res.column_at(0);
@@ -246,7 +246,7 @@ mod tests {
 
         let mut stream = order_by_executor.execute();
         let res = stream.next().await;
-        assert!(matches!(res, Some(_)));
+        assert!(res.is_some());
         if let Some(res) = res {
             let res = res.unwrap();
             let col0 = res.column_at(0);
@@ -296,7 +296,7 @@ mod tests {
 
         let mut stream = order_by_executor.execute();
         let res = stream.next().await;
-        assert!(matches!(res, Some(_)));
+        assert!(res.is_some());
         if let Some(res) = res {
             let res = res.unwrap();
             let col0 = res.column_at(0);
-Original file line number
+Diff line change
@@ Expand Up @@
         "signal",
         "fs",
     ] }
+    [lints]
+    workspace = true