adjustments required due to changed in `git-config` (#331)

Sebastian Thiel committed 4 years ago

Commit 41bfd3b1 parent 60af4c92 files · +2 −1Browse files

Unified · Split

2 files

git-config/src/parse/state.rs +1 −0
git-repository/src/config.rs +1 −1

git-config/src/parse/state.rs+1−0

@@ -53,6 +53,7 @@ impl<'a> State<'a> { · 52 unmodified lines
53	53	/// Returns an error if the string provided is not a valid `git-config`.
54	54	/// This generally is due to either invalid names or if there's extraneous
55	55	/// data succeeding valid `git-config` data.
	56	+ #[allow(clippy::should_implement_trait)]
56	57	pub fn from_str(input: &'a str) -> Result<State<'a>, Error<'a>> {
57	58	crate::parse::nom::from_bytes(input.as_bytes())
58	59	}

git-repository/src/config.rs+1−1

@@ -3,7 +3,7 @@ use crate::{bstr::BString, permission}; · 2 unmodified lines
3	3	#[derive(Debug, thiserror::Error)]
4	4	pub enum Error {
5	5	#[error("Could not open repository conifguration file")]
6		− Open(#[from] git_config::parser::ParserOrIoError<'static>),
	6	+ Open(#[from] git_config::parse::ParserOrIoError<'static>),
7	7	#[error("Cannot handle objects formatted as {:?}", .name)]
8	8	UnsupportedObjectFormat { name: crate::bstr::BString },
9	9	#[error("The value for '{}' cannot be empty", .key)]