bump toolchain

Signed-off-by: TennyZhuang <zty0826@gmail.com>

Author: TennyZhuang

Cargo.lock

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "scripts/source/prepare_ci_pubsub",
   "src/batch",

Cargo.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-05-31"
+channel = "nightly-2023-07-28"

ci/rust-toolchain

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #![allow(rustdoc::private_intra_doc_links)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(trait_alias)]
 #![feature(binary_heap_drain_sorted)]
 #![feature(is_sorted)]

src/common/src/lib.rs

@@ -49,7 +49,7 @@ pub fn place_vnode(
     // evenly among workers.
     let mut selected_pu_ids = Vec::new();
     while !new_pus.is_empty() {
-        new_pus.drain_filter(|ps| {
+        let _ = new_pus.extract_if(|ps| {
             if let Some(p) = ps.next() {
                 selected_pu_ids.push(p.id);
                 false

src/common/src/vnode_mapping/vnode_placement.rs

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #![feature(let_chains)]
-#![feature(hash_drain_filter)]
+#![feature(hash_extract_if)]
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};

src/ctl/src/lib.rs

@@ -307,7 +307,7 @@ pub fn factorization_expr(expr: ExprImpl) -> Vec<ExprImpl> {
     let (last, remaining) = disjunctions.split_last_mut().unwrap();
     // now greatest_common_factor == [C, D]
     let greatest_common_divider: Vec<_> = last
-        .drain_filter(|factor| remaining.iter().all(|expr| expr.contains(factor)))
+        .extract_if(|factor| remaining.iter().all(|expr| expr.contains(factor)))
         .collect();
     for disjunction in remaining {
         // remove common factors

src/frontend/src/expr/utils.rs

@@ -131,7 +131,7 @@ pub async fn handle_alter_table_column(
             // Locate the column by name and remove it.
             let column_name = column_name.real_value();
             let removed_column = columns
-                .drain_filter(|c| c.name.real_value() == column_name)
+                .extract_if(|c| c.name.real_value() == column_name)
                 .at_most_one()
                 .ok()
                 .unwrap();

src/frontend/src/handler/alter_table_column.rs

@@ -19,7 +19,7 @@
 #![feature(generators)]
 #![feature(proc_macro_hygiene, stmt_expr_attributes)]
 #![feature(trait_alias)]
-#![feature(drain_filter)]
+#![feature(extract_if)]
 #![feature(if_let_guard)]
 #![feature(let_chains)]
 #![feature(assert_matches)]

src/frontend/src/lib.rs

@@ -407,7 +407,7 @@ pub fn push_down_into_join(
         // Do not push now on to the on, it will be pulled up into a filter instead.
         let on = Condition {
             conjunctions: conjunctions
-                .drain_filter(|expr| expr.count_nows() == 0)
+                .extract_if(|expr| expr.count_nows() == 0)
                 .collect(),
         };
         predicate.conjunctions = conjunctions;