chore: Bump Rust toolchain

MazterQyou · MazterQyou · commit dc15ce71abc4 · 2023-12-08T21:55:00.000+04:00
diff --git a/.env b/.env
@@ -47,7 +47,7 @@ FEDORA=33
 PYTHON=3.6
 LLVM=11
 CLANG_TOOLS=8
-RUST=nightly-2022-03-08
+RUST=nightly-2022-03-22
 GO=1.15
 NODE=14
 MAVEN=3.5.4
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         arch: [amd64]
-        rust: [nightly-2022-03-08]
+        rust: [nightly-2022-03-22]
     container:
       image: ${{ matrix.arch }}/rust
       env:
@@ -92,7 +92,7 @@ jobs:
     strategy:
       matrix:
         arch: [amd64]
-        rust: [nightly-2022-03-08]
+        rust: [nightly-2022-03-22]
     container:
       image: ${{ matrix.arch }}/rust
       env:
@@ -157,8 +157,8 @@ jobs:
           submodules: true
       - name: Setup toolchain
         run: |
-          rustup toolchain install nightly-2022-03-08
-          rustup default nightly-2022-03-08
+          rustup toolchain install nightly-2022-03-22
+          rustup default nightly-2022-03-22
       - uses: actions/setup-python@v2
         with:
           python-version: "3.10"
@@ -210,7 +210,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, macos-latest]
-        rust: [nightly-2022-03-08]
+        rust: [nightly-2022-03-22]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -240,7 +240,7 @@ jobs:
   #   strategy:
   #     matrix:
   #       arch: [amd64]
-  #       rust: [nightly-2022-03-08]
+  #       rust: [nightly-2022-03-22]
   #   container:
   #     image: ${{ matrix.arch }}/rust
   #     env:
@@ -292,8 +292,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup toolchain
         run: |
-          rustup toolchain install nightly-2022-03-08
-          rustup default nightly-2022-03-08
+          rustup toolchain install nightly-2022-03-22
+          rustup default nightly-2022-03-22
           rustup component add rustfmt
       - name: Run
         run: cargo fmt --all -- --check
@@ -305,7 +305,7 @@ jobs:
     strategy:
       matrix:
         arch: [amd64]
-        rust: [nightly-2022-03-08]
+        rust: [nightly-2022-03-22]
     container:
       image: ${{ matrix.arch }}/rust
       env:
@@ -348,7 +348,7 @@ jobs:
     strategy:
       matrix:
         arch: [amd64]
-        rust: [nightly-2022-03-08]
+        rust: [nightly-2022-03-22]
     container:
       image: ${{ matrix.arch }}/rust
       env:
@@ -396,7 +396,7 @@ jobs:
 #   strategy:
 #     matrix:
 #       arch: [amd64]
-#       rust: [nightly-2022-03-08]
+#       rust: [nightly-2022-03-22]
 #   container:
 #     image: ${{ matrix.arch }}/rust
 #     env:
@@ -449,7 +449,7 @@ jobs:
 #   strategy:
 #     matrix:
 #       arch: [amd64]
-#       rust: [nightly-2022-03-08]
+#       rust: [nightly-2022-03-22]
 #   steps:
 #     - uses: actions/checkout@v2
 #       with:
diff --git a/ci/docker/linux-apt-lint.dockerfile b/ci/docker/linux-apt-lint.dockerfile
@@ -46,7 +46,7 @@ COPY ci/scripts/install_iwyu.sh /arrow/ci/scripts/
 RUN arrow/ci/scripts/install_iwyu.sh /tmp/iwyu /usr/local ${clang_tools}
 
 # Rust linter
-ARG rust=nightly-2022-03-08
+ARG rust=nightly-2022-03-22
 RUN curl https://sh.rustup.rs -sSf | \
     sh -s -- --default-toolchain stable -y
 ENV PATH /root/.cargo/bin:$PATH
diff --git a/datafusion/core/src/optimizer/projection_push_down.rs b/datafusion/core/src/optimizer/projection_push_down.rs
@@ -126,7 +126,7 @@ fn get_projected_schema(
 
 /// Recursively transverses the logical plan removing expressions and that are not needed.
 fn optimize_plan(
-    optimizer: &ProjectionPushDown,
+    _optimizer: &ProjectionPushDown,
     plan: &LogicalPlan,
     required_columns: &HashSet<Column>, // set of columns required up to this step
     has_projection: bool,
@@ -165,7 +165,7 @@ fn optimize_plan(
                 })?;
 
             let new_input = optimize_plan(
-                optimizer,
+                _optimizer,
                 input,
                 &new_required_columns,
                 true,
@@ -219,15 +219,15 @@ fn optimize_plan(
             }
 
             let optimized_left = Arc::new(optimize_plan(
-                optimizer,
+                _optimizer,
                 left,
                 &new_required_columns,
                 true,
                 _optimizer_config,
             )?);
 
             let optimized_right = Arc::new(optimize_plan(
-                optimizer,
+                _optimizer,
                 right,
                 &new_required_columns,
                 true,
@@ -276,7 +276,7 @@ fn optimize_plan(
             // none columns in window expr are needed, remove the window expr
             if new_window_expr.is_empty() {
                 return LogicalPlanBuilder::from(optimize_plan(
-                    optimizer,
+                    _optimizer,
                     input,
                     required_columns,
                     true,
@@ -292,7 +292,7 @@ fn optimize_plan(
             )?;
 
             LogicalPlanBuilder::from(optimize_plan(
-                optimizer,
+                _optimizer,
                 input,
                 &new_required_columns,
                 true,
@@ -344,7 +344,7 @@ fn optimize_plan(
                 group_expr: group_expr.clone(),
                 aggr_expr: new_aggr_expr,
                 input: Arc::new(optimize_plan(
-                    optimizer,
+                    _optimizer,
                     input,
                     &new_required_columns,
                     true,
@@ -393,7 +393,7 @@ fn optimize_plan(
 
             Ok(LogicalPlan::Analyze(Analyze {
                 input: Arc::new(optimize_plan(
-                    optimizer,
+                    _optimizer,
                     &a.input,
                     &required_columns,
                     false,
@@ -429,7 +429,7 @@ fn optimize_plan(
                             new_required_columns.insert(f.qualified_column());
                         });
                     optimize_plan(
-                        optimizer,
+                        _optimizer,
                         input_plan,
                         &new_required_columns,
                         has_projection,
@@ -478,7 +478,7 @@ fn optimize_plan(
                     .filter(|c| schema.index_of_column(c).is_ok()),
             );
             let input = optimize_plan(
-                optimizer,
+                _optimizer,
                 input,
                 &new_required_columns,
                 has_projection,
@@ -517,7 +517,7 @@ fn optimize_plan(
                 .iter()
                 .map(|input_plan| {
                     optimize_plan(
-                        optimizer,
+                        _optimizer,
                         input_plan,
                         &new_required_columns,
                         has_projection,
diff --git a/datafusion/core/src/physical_plan/sorts/sort.rs b/datafusion/core/src/physical_plan/sorts/sort.rs
@@ -283,6 +283,7 @@ fn in_mem_partial_sort(
         let pre_sort = if buffered_batches.len() == 1 {
             buffered_batches.pop()
         } else {
+            #[allow(clippy::iter_with_drain)]
             let batches = buffered_batches.drain(..).collect::<Vec<_>>();
             // combine all record batches into one for each column
             common::combine_batches(&batches, schema.clone())?
diff --git a/datafusion/jit/src/api.rs b/datafusion/jit/src/api.rs
@@ -260,6 +260,7 @@ impl<'a> CodeBlock<'a> {
                 Ok(Stmt::IfElse(Box::new(condition.clone()), stmts, Vec::new()))
             } else {
                 assert!(!then_stmts.is_empty());
+                #[allow(clippy::iter_with_drain)]
                 let then_stmts = then_stmts.drain(..).collect::<Vec<_>>();
                 let else_stmts = self.stmts.drain(..).collect::<Vec<_>>();
                 Ok(Stmt::IfElse(
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2022-03-08
+nightly-2022-03-22

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-nightly-2022-03-08`
	`1`	`+nightly-2022-03-22`