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

Fix compile error caused by updated Step::steps_between in Rust

Browse Source
This commit is contained in:
Marsman1996
2024-11-30 18:58:18 +08:00
committed by Tate, Hongliang Tian
parent 5e35704e38
commit 6d3bb5a9d0
10 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/src/lib.rs
View File

@ -9,7 +9,6 @@
#![allow(incomplete_features)]
#![feature(btree_cursors)]
#![feature(btree_extract_if)]
#![feature(const_option)]
#![feature(extend_one)]
#![feature(fn_traits)]
#![feature(format_args_nl)]

6
kernel/src/syscall/select.rs
View File

@ -108,9 +108,9 @@ fn do_select(
let mut poll_fds = Vec::with_capacity(nfds as usize);
for fd in 0..nfds {
let events = {
let readable = readfds.as_ref().map_or(false, |fds| fds.is_set(fd));
let writable = writefds.as_ref().map_or(false, |fds| fds.is_set(fd));
let except = exceptfds.as_ref().map_or(false, |fds| fds.is_set(fd));
let readable = readfds.as_ref().is_some_and(|fds| fds.is_set(fd));
let writable = writefds.as_ref().is_some_and(|fds| fds.is_set(fd));
let except = exceptfds.as_ref().is_some_and(|fds| fds.is_set(fd));
convert_rwe_to_events(readable, writable, except)
};