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

Fix make lint

Browse Source
This commit is contained in:
Felix Schütt
2022-10-13 19:09:55 +02:00
parent be8689a9ec
commit 5f831fc886
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/cli/src/cli.rs
View File

@@ -391,10 +391,7 @@ fn test_split_version() {
fn split_version(s: &str) -> Result<SplitVersion, anyhow::Error> {
let command = WasmerCLIOptions::command();
let prohibited_package_names = command
.get_subcommands()
.map(|s| s.get_name())
.collect::<Vec<_>>();
let mut prohibited_package_names = command.get_subcommands().map(|s| s.get_name());
let re1 = regex::Regex::new(r#"(.*)/(.*)@(.*):(.*)"#).unwrap();
let re2 = regex::Regex::new(r#"(.*)/(.*)@(.*)"#).unwrap();
@@ -404,7 +401,7 @@ fn split_version(s: &str) -> Result<SplitVersion, anyhow::Error> {
re1.captures(s)
.map(|c| {
c.iter()
.filter_map(|f| f)
.flatten()
.map(|m| m.as_str().to_owned())
.collect::<Vec<_>>()
})
@@ -413,7 +410,7 @@ fn split_version(s: &str) -> Result<SplitVersion, anyhow::Error> {
re2.captures(s)
.map(|c| {
c.iter()
.filter_map(|f| f)
.flatten()
.map(|m| m.as_str().to_owned())
.collect::<Vec<_>>()
})
@@ -422,7 +419,7 @@ fn split_version(s: &str) -> Result<SplitVersion, anyhow::Error> {
re3.captures(s)
.map(|c| {
c.iter()
.filter_map(|f| f)
.flatten()
.map(|m| m.as_str().to_owned())
.collect::<Vec<_>>()
})
@@ -451,7 +448,7 @@ fn split_version(s: &str) -> Result<SplitVersion, anyhow::Error> {
command: captures.get(4).cloned(),
};
if prohibited_package_names.contains(&sv.package.trim()) {
if prohibited_package_names.any(|s| s == sv.package.trim()) {
return Err(anyhow::anyhow!("Invalid package name {:?}", sv.package));
}