CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 21:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixup Rust typing errors

Browse source
This commit is contained in:
Till Wegmueller 2020-05-17 22:02:35 +02:00
parent b4f94e7313
commit d705ccdfeb
2 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/actions/mod.rs
View file

@ -178,9 +178,9 @@ pub fn parse_attr_action(line: String) -> Result<Attr, ManifestError> {
continue; continue;
} }
properties.push(Property{ properties.insert(Property{
key: String::from(&cap[1].trim()), key: String::from(cap[1].trim()),
value: String::from(&cap[2].trim()), value: String::from(cap[2].trim()),
}); });
} }
@ -189,9 +189,9 @@ pub fn parse_attr_action(line: String) -> Result<Attr, ManifestError> {
continue; continue;
} }
properties.push(Property{ properties.insert(Property{
key: String::from(&cap[1].trim()), key: String::from(cap[1].trim()),
value: String::from(&cap[2].trim()), value: String::from(cap[2].trim()),
}); });
} }

37
src/lib.rs
View file

@ -13,6 +13,7 @@ mod tests {
use crate::actions::ManifestError; use crate::actions::ManifestError;
use std::error; use std::error;
use std::fmt; use std::fmt;
use std::collections::HashSet;
#[test] #[test]
fn parse_manifest() { fn parse_manifest() {
@ -31,51 +32,63 @@ mod tests {
let testResults = vec![ let testResults = vec![
Attr{ Attr{
key: String::from("pkg.fmri"), key: String::from("pkg.fmri"),
values: vec![String::from("pkg://openindiana.org/web/server/nginx@1.18.0,5.11-2020.0.1.0:20200421T195136Z")] values: vec![String::from("pkg://openindiana.org/web/server/nginx@1.18.0,5.11-2020.0.1.0:20200421T195136Z")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("com.oracle.info.name"), key: String::from("com.oracle.info.name"),
values: vec![String::from("nginx"), String::from("test")] values: vec![String::from("nginx"), String::from("test")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("userland.info.git-remote"), key: String::from("userland.info.git-remote"),
values: vec![String::from("git://github.com/OpenIndiana/oi-userland.git")] values: vec![String::from("git://github.com/OpenIndiana/oi-userland.git")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("userland.info.git-branch"), key: String::from("userland.info.git-branch"),
values: vec![String::from("HEAD")] values: vec![String::from("HEAD")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("userland.info.git-rev"), key: String::from("userland.info.git-rev"),
values: vec![String::from("1665491ba61bd494bf73e2916cd2250f3024260e")] values: vec![String::from("1665491ba61bd494bf73e2916cd2250f3024260e")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("pkg.summary"), key: String::from("pkg.summary"),
values: vec![String::from("Nginx Webserver")] values: vec![String::from("Nginx Webserver")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("info.classification"), key: String::from("info.classification"),
values: vec![String::from("org.opensolaris.category.2008:Web Services/Application and Web Servers")] values: vec![String::from("org.opensolaris.category.2008:Web Services/Application and Web Servers")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("info.upstream-url"), key: String::from("info.upstream-url"),
values: vec![String::from("http://nginx.net/")] values: vec![String::from("http://nginx.net/")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("info.source-url"), key: String::from("info.source-url"),
values: vec![String::from("http://nginx.org/download/nginx-1.18.0.tar.gz")] values: vec![String::from("http://nginx.org/download/nginx-1.18.0.tar.gz")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("org.opensolaris.consolidation"), key: String::from("org.opensolaris.consolidation"),
values: vec![String::from("userland")] values: vec![String::from("userland")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("com.oracle.info.version"), key: String::from("com.oracle.info.version"),
values: vec![String::from("1.18.0")] values: vec![String::from("1.18.0")],
properties: HashSet::new(),
}, },
Attr{ Attr{
key: String::from("variant.arch"), key: String::from("variant.arch"),
values: vec![String::from("i386")] values: vec![String::from("i386")],
properties: HashSet::new(),
} }
]; ];