thanks clippy

Sebastian Thiel committed 4 years ago

Commit 7a2a31e1 parent 4420ae92 files · +2 −3Browse files

Unified · Split

2 files

git-config/tests/file/from_paths/includes/conditional/gitdir/mod.rs +1 −2
git-path/src/realpath.rs +1 −1

git-config/tests/file/from_paths/includes/conditional/gitdir/mod.rs+1−2

@@ -118,7 +118,7 @@ fn dot_slash_from_environment_causes_error() -> crate::Result { · 117 unmodified lines
118	118	{
119	119	let _environment = crate::file::from_env::Env::new()
120	120	.set("GIT_CONFIG_COUNT", "1")
121		− .set("GIT_CONFIG_KEY_0", format!("includeIf.gitdir:./worktree/.path"))
	121	+ .set("GIT_CONFIG_KEY_0", "includeIf.gitdir:./worktree/.path")
122	122	.set("GIT_CONFIG_VALUE_0", &absolute_path);
123	123
124	124	let res = git_config::File::from_env(env.include_options());
@@ -143,7 +143,6 @@ fn dot_slash_from_environment_causes_error() -> crate::Result { · 18 unmodified lines
143	143	.set("GIT_CONFIG_VALUE_0", absolute_path);
144	144
145	145	let res = git_config::File::from_env(env.include_options());
146		− dbg!(&res);
147	146	assert!(res.is_ok(), "missing paths are ignored as before");
148	147	}
149	148

git-path/src/realpath.rs+1−1

@@ -34,7 +34,7 @@ pub(crate) mod function { · 33 unmodified lines
34	34	let cwd = path
35	35	.as_ref()
36	36	.is_relative()
37		− .then(\|\| std::env::current_dir())
	37	+ .then(std::env::current_dir)
38	38	.unwrap_or_else(\|\| Ok(PathBuf::default()))
39	39	.map_err(Error::CurrentWorkingDir)?;
40	40	realpath_opts(path, cwd, MAX_SYMLINKS)