From c1860ee33dc310be5ccd9936e5c17a472835d76d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 10 Feb 2016 04:11:01 -0500 Subject: [PATCH] reorganize --- src/dictionary.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dictionary.rs b/src/dictionary.rs index 4096a7ab28..ff0f542f00 100644 --- a/src/dictionary.rs +++ b/src/dictionary.rs @@ -10,6 +10,14 @@ use std::path::{Path, PathBuf}; pub type VoiceName = String; +#[derive(RustcDecodable, RustcEncodable)] +pub struct VocabularyLibrary { + /** + * A map of several vocabularies with their associated speaker. + */ + pub library: HashMap +} + #[derive(RustcDecodable, RustcEncodable)] pub struct Vocabulary { /** @@ -19,14 +27,6 @@ pub struct Vocabulary { pub words: Vec } -#[derive(RustcDecodable, RustcEncodable)] -pub struct VocabularyLibrary { - /** - * A map of several vocabularies with their associated speaker. - */ - pub library: HashMap -} - impl VocabularyLibrary { /** Read all of the vocabularies under a directory. */ pub fn read_from_directory(directory: &Path) ->