From 5cf624f9ac7759652850f6b270ff077f43d4dcb8 Mon Sep 17 00:00:00 2001
From: Zhang Junyang <zhangjunyang.zjy@antgroup.com>
Date: Wed, 2 Aug 2023 12:11:42 +0800
Subject: [PATCH] Update toolchain to nightly 08-01

---
 Cargo.lock                                         | 8 ++++----
 framework/jinux-frame/src/lib.rs                   | 1 -
 rust-toolchain.toml                                | 2 +-
 services/libs/jinux-std/src/fs/epoll/epoll_file.rs | 2 +-
 services/libs/jinux-std/src/fs/utils/poll.rs       | 2 +-
 services/libs/jinux-std/src/lib.rs                 | 3 +--
 services/libs/jinux-std/src/process/mod.rs         | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8ffc0aa3..6f44ae0fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,9 +36,9 @@ version = "0.1.0"
 
 [[package]]
 name = "aml"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcf92e2afd8d6607e435cdc1d8ea76260fa467f6cf821f6af40e88dca15d183"
+checksum = "c4f8cba7d4260ea05671dda81029f6f718b54402a4ec926a0d9a41bdbb96b415"
 dependencies = [
  "bit_field",
  "bitvec",
@@ -928,9 +928,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/framework/jinux-frame/src/lib.rs b/framework/jinux-frame/src/lib.rs
index f6122a615..af77b889a 100644
--- a/framework/jinux-frame/src/lib.rs
+++ b/framework/jinux-frame/src/lib.rs
@@ -11,7 +11,6 @@
 #![feature(strict_provenance)]
 #![feature(link_llvm_intrinsics)]
 #![feature(const_trait_impl)]
-#![feature(const_ops)]
 #![feature(generators)]
 #![feature(iter_from_generator)]
 #![feature(const_mut_refs)]
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index c368a576a..175237df9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-02-05"
+channel = "nightly-2023-08-01"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
diff --git a/services/libs/jinux-std/src/fs/epoll/epoll_file.rs b/services/libs/jinux-std/src/fs/epoll/epoll_file.rs
index 76d8a7053..b1e7fd975 100644
--- a/services/libs/jinux-std/src/fs/epoll/epoll_file.rs
+++ b/services/libs/jinux-std/src/fs/epoll/epoll_file.rs
@@ -290,7 +290,7 @@ impl Drop for EpollFile {
         trace!("EpollFile Drop");
         let mut interest = self.interest.lock();
         let fds: Vec<_> = interest
-            .drain_filter(|_, _| true)
+            .extract_if(|_, _| true)
             .map(|(fd, entry)| {
                 entry.set_deleted();
                 if let Some(file) = entry.file() {
diff --git a/services/libs/jinux-std/src/fs/utils/poll.rs b/services/libs/jinux-std/src/fs/utils/poll.rs
index da32a5b3b..9d83abc80 100644
--- a/services/libs/jinux-std/src/fs/utils/poll.rs
+++ b/services/libs/jinux-std/src/fs/utils/poll.rs
@@ -175,7 +175,7 @@ impl Drop for Poller {
         }
 
         let self_observer = self.observer();
-        for (weak_pollee, _) in pollees.drain_filter(|_, _| true) {
+        for (weak_pollee, _) in pollees.extract_if(|_, _| true) {
             if let Some(pollee) = weak_pollee.upgrade() {
                 pollee.subject.unregister_observer(&self_observer);
             }
diff --git a/services/libs/jinux-std/src/lib.rs b/services/libs/jinux-std/src/lib.rs
index 072a69ba9..3891e6beb 100644
--- a/services/libs/jinux-std/src/lib.rs
+++ b/services/libs/jinux-std/src/lib.rs
@@ -4,9 +4,8 @@
 #![allow(dead_code)]
 #![allow(incomplete_features)]
 #![allow(unused_variables)]
-#![feature(cstr_from_bytes_until_nul)]
 #![feature(exclusive_range_pattern)]
-#![feature(btree_drain_filter)]
+#![feature(btree_extract_if)]
 #![feature(const_option)]
 #![feature(extend_one)]
 #![feature(let_chains)]
diff --git a/services/libs/jinux-std/src/process/mod.rs b/services/libs/jinux-std/src/process/mod.rs
index b6e2f421c..52785e2fd 100644
--- a/services/libs/jinux-std/src/process/mod.rs
+++ b/services/libs/jinux-std/src/process/mod.rs
@@ -278,7 +278,7 @@ impl Process {
         // move children to the init process
         if !self.is_init_process() {
             if let Some(init_process) = get_init_process() {
-                for (_, child_process) in self.children.lock().drain_filter(|_, _| true) {
+                for (_, child_process) in self.children.lock().extract_if(|_, _| true) {
                     child_process.set_parent(Arc::downgrade(&init_process));
                     init_process.add_child(child_process);
                 }