Showing the changes to git-commitgraph/src/graph (1 of 2 files). Show all
Unified · Split
| @@ -1,6 +1,6 @@ | |||
| 1 | use crate::{ | 1 | use crate::{ |
| 2 | file::{self, commit}, | 2 | file::{self, commit}, |
| 3 | graph, Graph, ImpossibleVariantError, GENERATION_NUMBER_MAX, | 3 | graph, Graph, GENERATION_NUMBER_MAX, |
| 4 | }; | 4 | }; |
| 5 | use git_object::owned; | 5 | use git_object::owned; |
| 6 | use std::cmp::{max, min}; | 6 | use std::cmp::{max, min}; |
| @@ -27,8 +27,7 @@ pub enum Error<E: std::error::Error + 'static> { · 20 unmodified lines | |||
| 27 | // `graph::verify::Error::File(file::verify::Error::Processor(...))`, because we are the | 27 | // `graph::verify::Error::File(file::verify::Error::Processor(...))`, because we are the |
| 28 | // file's processor, and we convert`file::verify::Error::Processor<graph::verify::Error>` | 28 | // file's processor, and we convert`file::verify::Error::Processor<graph::verify::Error>` |
| 29 | // variants into direct `graph::verify::Error` values. | 29 | // variants into direct `graph::verify::Error` values. |
| 30 | // TODO: Use never type when it becomes available. | 30 | err: file::verify::Error<std::convert::Infallible>, |
| 31 | err: file::verify::Error<ImpossibleVariantError>, | ||
| 32 | path: PathBuf, | 31 | path: PathBuf, |
| 33 | }, | 32 | }, |
| 34 | #[error("Commit {id}'s generation should be {expected} but is {actual}")] | 33 | #[error("Commit {id}'s generation should be {expected} but is {actual}")] |