mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-16 17:18:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix make lint

Browse Source
This commit is contained in:
Felix Schütt
2022-12-02 11:51:38 +01:00
parent 14dc05cc08
commit 81cde2b982
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cli/src/commands/create_exe.rs
View File

@@ -443,13 +443,13 @@ impl CreateExe {
} }
fn find_filename( fn find_filename(
local_tarball: &PathBuf, local_tarball: &Path,
target: &Triple, target: &Triple,
) -> Result<(String, PathBuf), anyhow::Error> { ) -> Result<(String, PathBuf), anyhow::Error> {
let target_file_path = local_tarball let target_file_path = local_tarball
.parent() .parent()
.and_then(|parent| Some(parent.join(local_tarball.file_stem()?))) .and_then(|parent| Some(parent.join(local_tarball.file_stem()?)))
.unwrap_or_else(|| local_tarball.clone()); .unwrap_or_else(|| local_tarball.to_path_buf());
let target_file_path = target_file_path let target_file_path = target_file_path
.parent() .parent()
@@ -457,7 +457,7 @@ impl CreateExe {
.unwrap_or_else(|| target_file_path.clone()); .unwrap_or_else(|| target_file_path.clone());
let _ = std::fs::create_dir_all(&target_file_path); let _ = std::fs::create_dir_all(&target_file_path);
let files = untar(local_tarball.clone(), target_file_path.clone())?; let files = untar(local_tarball.to_path_buf(), target_file_path.clone())?;
let tarball_dir = target_file_path.canonicalize().unwrap_or(target_file_path); let tarball_dir = target_file_path.canonicalize().unwrap_or(target_file_path);
let file = files let file = files
@@ -470,7 +470,7 @@ impl CreateExe {
Ok((file, tarball_dir)) Ok((file, tarball_dir))
} }
fn filter_tarballs(p: &PathBuf, target: &Triple) -> Option<PathBuf> { fn filter_tarballs(p: &Path, target: &Triple) -> Option<PathBuf> {
if let Architecture::Aarch64(_) = target.architecture { if let Architecture::Aarch64(_) = target.architecture {
if !p.file_name()?.to_str()?.contains("aarch64") { if !p.file_name()?.to_str()?.contains("aarch64") {
return None; return None;
@@ -503,7 +503,7 @@ impl CreateExe {
} }
} }
Some(p.clone()) Some(p.to_path_buf())
} }
fn compile_c( fn compile_c(