Skip to content

Commit 4cb7066

Browse files
DirEnt::from_inode: take the name as param
* DirEnt::from_inode: take the directory entry name as a param. * Add alloc::string::String in the prelude. * Remove all `use alloc::string::String` because now its in the prelude. Signed-off-by: Andy-Python-Programmer <[email protected]>
1 parent dcaabb2 commit 4cb7066

File tree

20 files changed

+9
-23
lines changed

20 files changed

+9
-23
lines changed

src/aero_kernel/src/arch/x86_64/tls.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
use core::alloc::Layout;
2929

3030
use alloc::alloc::alloc_zeroed;
31-
use alloc::string::String;
3231
use alloc::vec::Vec;
3332

3433
use super::gdt::*;

src/aero_kernel/src/drivers/drm/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ mod rawfb;
2121

2222
use core::sync::atomic::{AtomicUsize, Ordering};
2323

24-
use alloc::string::String;
2524
use alloc::sync::{Arc, Weak};
2625
use alloc::vec::Vec;
2726
use bit_field::BitField;

src/aero_kernel/src/drivers/keyboard.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* along with Aero. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20-
use alloc::string::String;
2120
use alloc::sync::{Arc, Weak};
2221
use alloc::vec::Vec;
2322
use spin::RwLock;

src/aero_kernel/src/drivers/tty.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* along with Aero. If not, see <https://www.gnu.org/licenses/>.
1818
*/
1919

20-
use alloc::string::String;
2120
use alloc::sync::{Arc, Weak};
2221
use alloc::vec::Vec;
2322

src/aero_kernel/src/fs/block.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use core::alloc::Layout;
22

33
use alloc::alloc::alloc_zeroed;
44
use alloc::collections::BTreeMap;
5-
use alloc::string::String;
65
use alloc::sync::{Arc, Weak};
76
use alloc::vec::Vec;
87

src/aero_kernel/src/fs/cache.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use core::fmt::Debug;
3030
use core::hash::Hash;
3131
use core::ops;
3232

33-
use alloc::string::String;
3433
use alloc::sync::Arc;
3534
use alloc::sync::Weak;
3635

src/aero_kernel/src/fs/devfs.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use core::mem;
2323
use core::sync::atomic::{AtomicUsize, Ordering};
2424

2525
use alloc::collections::BTreeMap;
26-
use alloc::string::String;
2726
use alloc::sync::Arc;
2827

2928
use spin::{Once, RwLock};

src/aero_kernel/src/fs/epoll.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use aero_syscall::SyscallError;
2323
use alloc::sync::Arc;
2424
use hashbrown::HashMap;
2525

26+
use crate::fs::cache::DirCacheImpl;
2627
use crate::userland::scheduler;
2728
use crate::utils::sync::Mutex;
2829

src/aero_kernel/src/fs/inode.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use core::sync::atomic::{AtomicUsize, Ordering};
2222
use aero_syscall::prelude::{EPollEventFlags, PollEventFlags};
2323
use aero_syscall::{MMapFlags, OpenFlags};
2424

25-
use alloc::string::String;
2625
use alloc::sync::Arc;
2726
use alloc::sync::Weak;
2827

@@ -418,15 +417,15 @@ impl DirEntry {
418417
})
419418
}
420419

421-
pub fn from_inode(inode: Arc<dyn INodeInterface>) -> DirCacheItem {
420+
pub fn from_inode(inode: Arc<dyn INodeInterface>, name: String) -> DirCacheItem {
422421
let icache = cache::icache();
423422
let inode = icache.make_item_no_cache(CachedINode::new(inode));
424423

425424
cache::dcache().make_item_no_cache(Self {
426425
data: Mutex::new(DirProtectedData {
427426
parent: None,
428427

429-
name: String::new(),
428+
name,
430429
inode: inode.clone(),
431430
}),
432431

src/aero_kernel/src/fs/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use core::mem;
2121

2222
use aero_syscall::SyscallError;
2323
use alloc::collections::BTreeMap;
24-
use alloc::string::String;
2524
use alloc::sync::Arc;
2625

2726
use crate::userland::scheduler;

0 commit comments

Comments
 (0)