|
1 | 1 | use std::error::Error; |
| 2 | +use std::fmt::Display; |
2 | 3 | use std::path::{Path, PathBuf}; |
3 | 4 | use std::process::Command; |
4 | 5 | use std::{env, fs, io}; |
@@ -127,11 +128,12 @@ impl Build { |
127 | 128 | // Copy release version file |
128 | 129 | let relver = build_dir.join(".relver"); |
129 | 130 | fs::copy(manifest_dir.join("luajit_relver.txt"), &relver) |
130 | | - .context(|| format!("Cannot copy 'luajit_relver.txt'"))?; |
| 131 | + .context(|| "Cannot copy 'luajit_relver.txt'")?; |
131 | 132 |
|
132 | 133 | // Fix permissions for certain build situations |
133 | 134 | let mut perms = (fs::metadata(&relver).map(|md| md.permissions())) |
134 | 135 | .context(|| format!("Cannot read permissions for '{}'", relver.display()))?; |
| 136 | + #[allow(clippy::permissions_set_readonly_false)] |
135 | 137 | perms.set_readonly(false); |
136 | 138 | fs::set_permissions(&relver, perms) |
137 | 139 | .context(|| format!("Cannot set permissions for '{}'", relver.display()))?; |
@@ -266,7 +268,7 @@ impl Build { |
266 | 268 | // Copy release version file |
267 | 269 | let relver = build_dir.join(".relver"); |
268 | 270 | fs::copy(manifest_dir.join("luajit_relver.txt"), &relver) |
269 | | - .context(|| format!("Cannot copy 'luajit_relver.txt'"))?; |
| 271 | + .context(|| "Cannot copy 'luajit_relver.txt'")?; |
270 | 272 |
|
271 | 273 | let mut msvcbuild = Command::new(build_dir.join("src").join("msvcbuild.bat")); |
272 | 274 | msvcbuild.current_dir(build_dir.join("src")); |
@@ -389,11 +391,11 @@ impl Artifacts { |
389 | 391 | } |
390 | 392 |
|
391 | 393 | trait ErrorContext<T> { |
392 | | - fn context(self, f: impl FnOnce() -> String) -> Result<T, DynError>; |
| 394 | + fn context<D: Display>(self, f: impl FnOnce() -> D) -> Result<T, DynError>; |
393 | 395 | } |
394 | 396 |
|
395 | 397 | impl<T, E: Error> ErrorContext<T> for Result<T, E> { |
396 | | - fn context(self, f: impl FnOnce() -> String) -> Result<T, DynError> { |
| 398 | + fn context<D: Display>(self, f: impl FnOnce() -> D) -> Result<T, DynError> { |
397 | 399 | self.map_err(|e| format!("{}: {e}", f()).into()) |
398 | 400 | } |
399 | 401 | } |
0 commit comments