matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

We should really use String here

Browse source
This commit is contained in:
Matthias Beyer 2015-11-10 16:53:30 +01:00
parent cd72295c1a
commit 51f6af6346
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/module/bm/header.rs
View file

@ -6,11 +6,11 @@ pub fn get_spec() -> FHS {
} }
fn url_key() -> FHS { fn url_key() -> FHS {
FHS::Key { name: "URL", value_type: Box::new(FHS::Text) } FHS::Key { name: String::from("URL"), value_type: Box::new(FHS::Text) }
} }
fn tags_key() -> FHS { fn tags_key() -> FHS {
FHS::Key { name: "TAGS", value_type: Box::new(text_array()) } FHS::Key { name: String::from("TAGS"), value_type: Box::new(text_array()) }
} }
fn text_array() -> FHS { fn text_array() -> FHS {
@ -22,11 +22,11 @@ pub fn build_header(url: &String, tags: &Vec<String>) -> FHD {
FHD::Map { FHD::Map {
keys: vec![ keys: vec![
FHD::Key { FHD::Key {
name: "URL", name: String::from("URL"),
value: Box::new(FHD::Text(url.clone())) value: Box::new(FHD::Text(url.clone()))
}, },
FHD::Key { FHD::Key {
name: "TAGS", name: String::from("TAGS"),
value: Box::new(FHD::Text(tags.connect(","))) value: Box::new(FHD::Text(tags.connect(",")))
} }
] ]

4
src/storage/file.rs
View file

@ -16,7 +16,7 @@ pub enum FileHeaderSpec {
UInteger, UInteger,
Float, Float,
Text, Text,
Key { name: &'static str, value_type: Box<FileHeaderSpec> }, Key { name: String, value_type: Box<FileHeaderSpec> },
Map { keys: Vec<FileHeaderSpec> }, Map { keys: Vec<FileHeaderSpec> },
Array { allowed_types: Vec<FileHeaderSpec> }, Array { allowed_types: Vec<FileHeaderSpec> },
} }
@ -30,7 +30,7 @@ pub enum FileHeaderData {
UInteger(u64), UInteger(u64),
Float(f64), Float(f64),
Text(String), Text(String),
Key { name: &'static str, value: Box<FileHeaderData> }, Key { name: String, value: Box<FileHeaderData> },
Map { keys: Vec<FileHeaderData> }, Map { keys: Vec<FileHeaderData> },
Array { values: Box<Vec<FileHeaderData>> }, Array { values: Box<Vec<FileHeaderData>> },
} }