[commitgraph] Rename LexPosition to 'file::Position'

That way it's in line with 'graph::Position'

Sebastian Thiel committed 6 years ago

Commit 6f90bee1 parent d2eec1d6 files · +72 −55Browse files

Showing the changes to git-commitgraph/src/file/commit.rs (1 of 6 files). Show all

Unified · Split

git-commitgraph/src/file/commit.rs+20−16

-use crate::file::{File, LexPosition};
+use crate::{
-use crate::graph::Position;
+    file::{self, File},
+    graph,
+};
 use byteorder::{BigEndian, ByteOrder};
 use git_object::{borrowed, owned, SHA1_SIZE};
 use quick_error::quick_error;
-use std::convert::{TryFrom, TryInto};
+use std::{
-use std::fmt::{Debug, Formatter};
+    convert::{TryFrom, TryInto},
-use std::slice::Chunks;
+    fmt::{Debug, Formatter},
+    slice::Chunks,
+};
 quick_error! {
     #[derive(Debug)]
 pub struct Commit<'a> {
     file: &'a File,
-    lex_pos: LexPosition,
+    lex_pos: file::Position,
     // We can parse the below fields lazily if needed.
     commit_timestamp: u64,
     generation: u32,
 }
 impl<'a> Commit<'a> {
-    pub(crate) fn new(file: &'a File, pos: LexPosition) -> Self {
+    pub(crate) fn new(file: &'a File, pos: file::Position) -> Self {
         let bytes = file.commit_data_bytes(pos);
         Commit {
             file,
         self.generation
     }
-    pub fn iter_parents(&'a self) -> impl Iterator<Item = Result<Position, Error>> + 'a {
+    pub fn iter_parents(&'a self) -> impl Iterator<Item = Result<graph::Position, Error>> + 'a {
         // I didn't find a combinator approach that a) was as strict as ParentIterator, b) supported
         // fuse-after-first-error behavior, and b) was significantly shorter or more understandable
         // than ParentIterator. So here we are.
         self.file.id_at(self.lex_pos)
     }
-    pub fn parent1(&self) -> Result<Option<Position>, Error> {
+    pub fn parent1(&self) -> Result<Option<graph::Position>, Error> {
         self.iter_parents().next().transpose()
     }
 }
 impl<'a> Iterator for ParentIterator<'a> {
-    type Item = Result<Position, Error>;
+    type Item = Result<graph::Position, Error>;
     fn next(&mut self) -> Option<Self::Item> {
         let state = std::mem::replace(&mut self.state, ParentIteratorState::Exhausted);
 #[derive(Clone, Copy, Debug)]
 enum ParentEdge {
     None,
-    GraphPosition(Position),
+    GraphPosition(graph::Position),
     ExtraEdgeIndex(u32),
 }
         if raw & EXTENDED_EDGES_MASK != 0 {
             ParentEdge::ExtraEdgeIndex(raw & !EXTENDED_EDGES_MASK)
         } else {
-            ParentEdge::GraphPosition(Position(raw))
+            ParentEdge::GraphPosition(graph::Position(raw))
         }
     }
 }
 const LAST_EXTENDED_EDGE_MASK: u32 = 0x8000_0000;
 enum ExtraEdge {
-    Internal(Position),
+    Internal(graph::Position),
-    Last(Position),
+    Last(graph::Position),
 }
 impl ExtraEdge {
     pub fn from_raw(raw: u32) -> Self {
         if raw & LAST_EXTENDED_EDGE_MASK != 0 {
-            Self::Last(Position(raw & !LAST_EXTENDED_EDGE_MASK))
+            Self::Last(graph::Position(raw & !LAST_EXTENDED_EDGE_MASK))
         } else {
-            Self::Internal(Position(raw))
+            Self::Internal(graph::Position(raw))
         }
     }
 }