Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update toolchain to nightly 08-01

Browse Source
This commit is contained in:
Zhang Junyang
2023-08-02 12:11:42 +08:00
committed by Tate, Hongliang Tian
parent e6f13a0612
commit 5cf624f9ac
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -36,9 +36,9 @@ version = "0.1.0"
[[package]] [[package]]
name = "aml" name = "aml"
version = "0.16.3" version = "0.16.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dcf92e2afd8d6607e435cdc1d8ea76260fa467f6cf821f6af40e88dca15d183" checksum = "c4f8cba7d4260ea05671dda81029f6f718b54402a4ec926a0d9a41bdbb96b415"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"bitvec", "bitvec",
@ -928,9 +928,9 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.56" version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]

1
framework/jinux-frame/src/lib.rs
View File

@ -11,7 +11,6 @@
#![feature(strict_provenance)] #![feature(strict_provenance)]
#![feature(link_llvm_intrinsics)] #![feature(link_llvm_intrinsics)]
#![feature(const_trait_impl)] #![feature(const_trait_impl)]
#![feature(const_ops)]
#![feature(generators)] #![feature(generators)]
#![feature(iter_from_generator)] #![feature(iter_from_generator)]
#![feature(const_mut_refs)] #![feature(const_mut_refs)]

2
rust-toolchain.toml
View File

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2023-02-05" channel = "nightly-2023-08-01"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

2
services/libs/jinux-std/src/fs/epoll/epoll_file.rs
View File

@ -290,7 +290,7 @@ impl Drop for EpollFile {
trace!("EpollFile Drop"); trace!("EpollFile Drop");
let mut interest = self.interest.lock(); let mut interest = self.interest.lock();
let fds: Vec<_> = interest let fds: Vec<_> = interest
.drain_filter(|_, _| true) .extract_if(|_, _| true)
.map(|(fd, entry)| { .map(|(fd, entry)| {
entry.set_deleted(); entry.set_deleted();
if let Some(file) = entry.file() { if let Some(file) = entry.file() {

2
services/libs/jinux-std/src/fs/utils/poll.rs
View File

@ -175,7 +175,7 @@ impl Drop for Poller {
} }
let self_observer = self.observer(); 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() { if let Some(pollee) = weak_pollee.upgrade() {
pollee.subject.unregister_observer(&self_observer); pollee.subject.unregister_observer(&self_observer);
} }

3
services/libs/jinux-std/src/lib.rs
View File

@ -4,9 +4,8 @@
#![allow(dead_code)] #![allow(dead_code)]
#![allow(incomplete_features)] #![allow(incomplete_features)]
#![allow(unused_variables)] #![allow(unused_variables)]
#![feature(cstr_from_bytes_until_nul)]
#![feature(exclusive_range_pattern)] #![feature(exclusive_range_pattern)]
#![feature(btree_drain_filter)] #![feature(btree_extract_if)]
#![feature(const_option)] #![feature(const_option)]
#![feature(extend_one)] #![feature(extend_one)]
#![feature(let_chains)] #![feature(let_chains)]

2
services/libs/jinux-std/src/process/mod.rs
View File

@ -278,7 +278,7 @@ impl Process {
// move children to the init process // move children to the init process
if !self.is_init_process() { if !self.is_init_process() {
if let Some(init_process) = get_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)); child_process.set_parent(Arc::downgrade(&init_process));
init_process.add_child(child_process); init_process.add_child(child_process);
} }