[commitgraph] refactor Graph, Position, and access module

Sebastian Thiel committed 6 years ago

Commit 3c8640e1 parent 2ed00378 files · +47 −32Browse files

Showing the changes to git-commitgraph/src/graph (3 of 8 files). Show all

Unified · Split

3 files

git-commitgraph/src/graph/access.rs +16 −10
git-commitgraph/src/graph/init.rs +8 −4
git-commitgraph/src/graph/mod.rs +5 −5

git-commitgraph/src/graph/access.rs+16−10

-use crate::file::{Commit, File, LexPosition};
+use crate::{
-use crate::graph::{Graph, GraphPosition};
+    file::{Commit, File, LexPosition},
+    graph::{Graph, Position},
+};
 use git_object::borrowed;
+/// Access convenience
 impl Graph {
-    pub fn commit_at(&self, pos: GraphPosition) -> Commit<'_> {
+    pub fn commit_at(&self, pos: Position) -> Commit<'_> {
         let r = self.lookup_by_pos(pos);
         r.file.commit_at(r.lex_pos)
     }
         Some(r.file.commit_at(r.lex_pos))
     }
-    pub fn id_at(&self, pos: GraphPosition) -> borrowed::Id<'_> {
+    pub fn id_at(&self, pos: Position) -> borrowed::Id<'_> {
         let r = self.lookup_by_pos(pos);
         r.file.id_at(r.lex_pos)
     }
         self.files.iter().flat_map(|file| file.iter_ids())
     }
-    pub fn lookup(&self, id: borrowed::Id<'_>) -> Option<GraphPosition> {
+    pub fn lookup(&self, id: borrowed::Id<'_>) -> Option<Position> {
         Some(self.lookup_by_id(id)?.graph_pos)
     }
     }
 }
+/// Access fundamentals
 impl Graph {
     fn lookup_by_id(&self, id: borrowed::Id<'_>) -> Option<LookupByIdResult<'_>> {
         let mut current_file_start = 0;
-        for file in self.files.iter() {
+        for file in &self.files {
             if let Some(lex_pos) = file.lookup(id) {
                 return Some(LookupByIdResult {
                     file,
                     lex_pos,
-                    graph_pos: GraphPosition(current_file_start + lex_pos.0),
+                    graph_pos: Position(current_file_start + lex_pos.0),
                 });
             }
             current_file_start += file.num_commits();
         None
     }
-    fn lookup_by_pos(&self, pos: GraphPosition) -> LookupByPositionResult<'_> {
+    fn lookup_by_pos(&self, pos: Position) -> LookupByPositionResult<'_> {
         let mut remaining = pos.0;
-        for file in self.files.iter() {
+        for file in &self.files {
             match remaining.checked_sub(file.num_commits()) {
                 Some(v) => remaining = v,
                 None => {
     }
 }
+#[derive(Clone)]
 struct LookupByIdResult<'a> {
     pub file: &'a File,
-    pub graph_pos: GraphPosition,
+    pub graph_pos: Position,
     pub lex_pos: LexPosition,
 }
+#[derive(Clone)]
 struct LookupByPositionResult<'a> {
     pub file: &'a File,
     pub lex_pos: LexPosition,

git-commitgraph/src/graph/init.rs+8−4

-use crate::file::File;
+use crate::{
-use crate::{file, Graph, MAX_COMMITS};
+    file::{self, File},
+    Graph, MAX_COMMITS,
+};
 use git_object::HashKind;
 use quick_error::quick_error;
-use std::io::{BufRead, BufReader};
+use std::{
-use std::path::{Path, PathBuf};
+    io::{BufRead, BufReader},
+    path::{Path, PathBuf},
+};
 quick_error! {
     #[derive(Debug)]

git-commitgraph/src/graph/mod.rs+5−5

@@ -3,7 +3,7 @@ mod access; · 2 unmodified lines
3	mod init;	3	mod init;
4		4
5	use crate::file::File;	5	use crate::file::File;
6	use std::fmt::{Display, Formatter};	6	use std::fmt;
7		7
8	/// A complete commit graph.	8	/// A complete commit graph.
9	///	9	///
@@ -14,11 +14,11 @@ pub struct Graph { · 4 unmodified lines
14	files: Vec<File>,	14	files: Vec<File>,
15	}	15	}
16		16
17	#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]	17	#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd, Hash)]
18	pub struct GraphPosition(pub u32);	18	pub struct Position(pub u32);
19		19
20	impl Display for GraphPosition {	20	impl fmt::Display for Position {
21	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {	21	fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
22	self.0.fmt(f)	22	self.0.fmt(f)
23	}	23	}
24	}	24	}