Skip to content

Commit e8aa228

Browse files
committed
rename Node::new_node to something more specific "from_type_and_metadata"
Signed-off-by: simonsan <[email protected]>
1 parent eaae7c2 commit e8aa228

File tree

6 files changed

+26
-16
lines changed

6 files changed

+26
-16
lines changed

crates/core/src/archiver/tree.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ where
9999
mode: Some(0o755),
100100
..Default::default()
101101
};
102-
let node = Node::new_node(&p, NodeType::Dir, meta).ok()?;
102+
let node =
103+
Node::from_type_and_metadata(&p, NodeType::Dir, meta).ok()?;
103104
return Some(TreeType::NewTree((self.path.clone(), node, p)));
104105
}
105106
}

crates/core/src/backend/ignore.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,13 @@ fn map_entry(
392392
};
393393

394394
let node = if m.is_dir() {
395-
Node::new_node(name, NodeType::Dir, meta)
395+
Node::from_type_and_metadata(name, NodeType::Dir, meta)
396396
} else if m.is_symlink() {
397397
let target = read_link(entry.path()).map_err(IgnoreErrorKind::FromIoError)?;
398398
let node_type = NodeType::from_link(&target);
399-
Node::new_node(name, node_type, meta)
399+
Node::from_type_and_metadata(name, node_type, meta)
400400
} else {
401-
Node::new_node(name, NodeType::File, meta)
401+
Node::from_type_and_metadata(name, NodeType::File, meta)
402402
};
403403

404404
let path = entry.into_path();
@@ -555,23 +555,23 @@ fn map_entry(
555555
let filetype = m.file_type();
556556

557557
let node = if m.is_dir() {
558-
Node::new_node(name, NodeType::Dir, meta)
558+
Node::from_type_and_metadata(name, NodeType::Dir, meta)
559559
} else if m.is_symlink() {
560560
let target = read_link(entry.path()).map_err(IgnoreErrorKind::FromIoError)?;
561561
let node_type = NodeType::from_link(&target);
562-
Node::new_node(name, node_type, meta)
562+
Node::from_type_and_metadata(name, node_type, meta)
563563
} else if filetype.is_block_device() {
564564
let node_type = NodeType::Dev { device: m.rdev() };
565-
Node::new_node(name, node_type, meta)
565+
Node::from_type_and_metadata(name, node_type, meta)
566566
} else if filetype.is_char_device() {
567567
let node_type = NodeType::Chardev { device: m.rdev() };
568-
Node::new_node(name, node_type, meta)
568+
Node::from_type_and_metadata(name, node_type, meta)
569569
} else if filetype.is_fifo() {
570-
Node::new_node(name, NodeType::Fifo, meta)
570+
Node::from_type_and_metadata(name, NodeType::Fifo, meta)
571571
} else if filetype.is_socket() {
572-
Node::new_node(name, NodeType::Socket, meta)
572+
Node::from_type_and_metadata(name, NodeType::Socket, meta)
573573
} else {
574-
Node::new_node(name, NodeType::File, meta)
574+
Node::from_type_and_metadata(name, NodeType::File, meta)
575575
};
576576

577577
let path = entry.into_path();

crates/core/src/backend/node.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,11 @@ impl Node {
280280
/// # Returns
281281
///
282282
/// The created [`Node`]
283-
pub fn new_node(name: &OsStr, node_type: NodeType, meta: Metadata) -> RusticResult<Self> {
283+
pub fn from_type_and_metadata(
284+
name: &OsStr,
285+
node_type: NodeType,
286+
meta: Metadata,
287+
) -> RusticResult<Self> {
284288
Ok(Self {
285289
name: escape_file_name(name)?,
286290
node_type,

crates/core/src/backend/stdin.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ impl Iterator for StdinSource {
6969

7070
Some(Ok(ReadSourceEntry {
7171
path: self.path.clone(),
72-
node: Node::new_node(self.path.file_name()?, NodeType::File, Metadata::default())
73-
.ok()?,
72+
node: Node::from_type_and_metadata(
73+
self.path.file_name()?,
74+
NodeType::File,
75+
Metadata::default(),
76+
)
77+
.ok()?,
7478
open: Some(OpenStdin()),
7579
}))
7680
}

crates/core/src/blob/tree.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ impl Tree {
139139
id: Id,
140140
path: &Path,
141141
) -> RusticResult<Node> {
142-
let mut node = Node::new_node(OsStr::new(""), NodeType::Dir, Metadata::default())?;
142+
let mut node =
143+
Node::from_type_and_metadata(OsStr::new(""), NodeType::Dir, Metadata::default())?;
143144
node.subtree = Some(id);
144145

145146
for p in path.components() {

crates/core/src/vfs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ impl Vfs {
384384
VfsTree::Link(target) => NodeType::from_link(Path::new(target)),
385385
_ => NodeType::Dir,
386386
};
387-
Node::new_node(name, node_type, Metadata::default())
387+
Node::from_type_and_metadata(name, node_type, Metadata::default())
388388
})
389389
.collect::<RusticResult<Vec<Node>>>()?,
390390
VfsPath::Link(str) => {

0 commit comments

Comments
 (0)