Unified · Split
| @@ -142,11 +142,10 @@ mod cache { · 141 unmodified lines | |||
| 142 | std::env::var_os("XDG_CONFIG_HOME") | 142 | std::env::var_os("XDG_CONFIG_HOME") |
| 143 | .map(|path| (path, &self.xdg_config_home_env)) | 143 | .map(|path| (path, &self.xdg_config_home_env)) |
| 144 | .or_else(|| std::env::var_os("HOME").map(|path| (path, &self.home_env))) | 144 | .or_else(|| std::env::var_os("HOME").map(|path| (path, &self.home_env))) |
| 145 | .map(|(base, permission)| { | 145 | .and_then(|(base, permission)| { |
| 146 | let resource = std::path::PathBuf::from(base).join("git").join(resource_file_name); | 146 | let resource = std::path::PathBuf::from(base).join("git").join(resource_file_name); |
| 147 | permission.check(resource).transpose() | 147 | permission.check(resource).transpose() |
| 148 | }) | 148 | }) |
| 149 | .flatten() | ||
| 150 | .transpose() | 149 | .transpose() |
| 151 | } | 150 | } |
| 152 | } | 151 | } |
| @@ -153,7 +153,7 @@ impl Permission { · 152 unmodified lines | |||
| 153 | Permission::Deny => Ok(None), | 153 | Permission::Deny => Ok(None), |
| 154 | Permission::Forbid => Err(permission::Error { | 154 | Permission::Forbid => Err(permission::Error { |
| 155 | resource, | 155 | resource, |
| 156 | permission: self.clone(), | 156 | permission: *self, |
| 157 | }), | 157 | }), |
| 158 | } | 158 | } |
| 159 | } | 159 | } |