mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cob: Remove redundant type 

Signed-off-by: Alexis Sellier <self@cloudhead.io>
This commit is contained in:
Alexis Sellier 2022-12-27 17:30:06 +01:00
parent f193d7d6cc
commit f6177f85fe
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
radicle-cob/src/history.rs
View File

@ -60,8 +60,8 @@ impl History {
}; };
let mut entries = HashMap::new(); let mut entries = HashMap::new();
entries.insert(id, EntryWithClock::from(root_entry)); entries.insert(id, EntryWithClock::from(root_entry));
let NewGraph { graph, indices } = create_petgraph(&id, &entries);
Self { graph, indices } create_petgraph(&id, &entries)
} }
pub fn new<Id>(root: Id, entries: HashMap<EntryId, EntryWithClock>) -> Result<Self, CreateError> pub fn new<Id>(root: Id, entries: HashMap<EntryId, EntryWithClock>) -> Result<Self, CreateError>
@ -72,8 +72,7 @@ impl History {
if !entries.contains_key(&root) { if !entries.contains_key(&root) {
Err(CreateError::MissingRoot) Err(CreateError::MissingRoot)
} else { } else {
let NewGraph { graph, indices } = create_petgraph(&root, &entries); Ok(create_petgraph(&root, &entries))
Ok(Self { graph, indices })
} }
} }
@ -160,15 +159,10 @@ impl History {
} }
} }
struct NewGraph {
graph: petgraph::Graph<EntryWithClock, (), petgraph::Directed, u32>,
indices: HashMap<EntryId, petgraph::graph::NodeIndex<u32>>,
}
fn create_petgraph<'a>( fn create_petgraph<'a>(
root: &'a EntryId, root: &'a EntryId,
entries: &'a HashMap<EntryId, EntryWithClock>, entries: &'a HashMap<EntryId, EntryWithClock>,
) -> NewGraph { ) -> History {
let mut graph = petgraph::Graph::new(); let mut graph = petgraph::Graph::new();
let mut indices = HashMap::<EntryId, petgraph::graph::NodeIndex<u32>>::new(); let mut indices = HashMap::<EntryId, petgraph::graph::NodeIndex<u32>>::new();
let root = entries.get(root).unwrap().clone(); let root = entries.get(root).unwrap().clone();
@ -185,5 +179,5 @@ fn create_petgraph<'a>(
to_process.push(child.clone()); to_process.push(child.clone());
} }
} }
NewGraph { graph, indices } History { graph, indices }
} }