replace 'ImpossibleVariantError' with 'std::convert::Infallible'`

Sebastian Thiel committed 6 years ago

Commit c53638c1 parent 8c658da2 files · +2 −15Browse files

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

Unified · Split

2 files

 use crate::{
     file::{self, commit},
-    graph, Graph, ImpossibleVariantError, GENERATION_NUMBER_MAX,
+    graph, Graph, GENERATION_NUMBER_MAX,
 };
 use git_object::owned;
 use std::cmp::{max, min};
         // `graph::verify::Error::File(file::verify::Error::Processor(...))`, because we are the
         // file's processor, and we convert`file::verify::Error::Processor<graph::verify::Error>`
         // variants into direct `graph::verify::Error` values.
-        // TODO: Use never type when it becomes available.
+        err: file::verify::Error<std::convert::Infallible>,
-        err: file::verify::Error<ImpossibleVariantError>,
         path: PathBuf,
     },
     #[error("Commit {id}'s generation should be {expected} but is {actual}")]

@@ -11,15 +11,3 @@ pub const GENERATION_NUMBER_MAX: u32 = 0x3fff_ffff; · 10 unmodified lines
11		11
12	/// The maximum number of commits that can be stored in a commit graph.	12	/// The maximum number of commits that can be stored in a commit graph.
13	pub const MAX_COMMITS: u32 = (1 << 30) + (1 << 29) + (1 << 28) - 1;	13	pub const MAX_COMMITS: u32 = (1 << 30) + (1 << 29) + (1 << 28) - 1;
14
15	// TODO: pub type ImpossibleVariantError = !;
16	#[derive(Debug)]
17	pub struct ImpossibleVariantError;
18
19	impl std::error::Error for ImpossibleVariantError {}
20
21	impl std::fmt::Display for ImpossibleVariantError {
22	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
23	f.write_str("this enum was constructed with an invalid variant")
24	}
25	}