Adjustments due to files structures.

diff --git a/examples/form.rs b/examples/form.rs
index 1754850e9ac7fbda56baec4d1764294bc767d22d..e621365935fb52b3533843737fc825340d1695ff 100644 (file)
--- a/examples/form.rs
+++ b/examples/form.rs
@@ -1,8 +1,6 @@
 extern crate zakform;
 
-use zakform::TField;
-
-use zakform::filters;
+use zakform::{form, fields, filters, fields::TField};
 
 use std::collections::HashMap;
 
@@ -56,24 +54,24 @@ async fn index(
 
        s.push_str(r#"<form method="post" action="/">"#);
 
-       let mut f = zakform::Form::new();
+       let mut f = zakform::form::Form::new();
 
-       let mut fi = zakform::FieldText::new("text");
-       f.add_field(zakform::TFields::TFieldText(fi));
+       let mut fi = zakform::fields::FieldText::new("text");
+       f.add_field(zakform::form::TFields::TFieldText(fi));
 
-       let mut fi = zakform::FieldRadio::new("radio");
-       fi.add_option(zakform::FOption{ value: String::from("F"), label: String::from("Female") });
-       fi.add_option(zakform::FOption{ value: String::from("M"), label: String::from("Male") });
+       let mut fi = zakform::fields::FieldRadio::new("radio");
+       fi.add_option(zakform::fields::FOption{ value: String::from("F"), label: String::from("Female") });
+       fi.add_option(zakform::fields::FOption{ value: String::from("M"), label: String::from("Male") });
 
        let single = fi.render_single(1);
 
-       f.add_field(zakform::TFields::TFieldRadio(fi));
+       f.add_field(zakform::form::TFields::TFieldRadio(fi));
 
        let fs = f.fields();
        for fi in fs {
                match fi {
-                       zakform::TFields::TFieldText(fi) => { s.push_str(fi.render().as_str()); },
-                       zakform::TFields::TFieldRadio(fi) => { s.push_str(fi.render().as_str()); },
+                       zakform::form::TFields::TFieldText(fi) => { s.push_str(fi.render().as_str()); },
+                       zakform::form::TFields::TFieldRadio(fi) => { s.push_str(fi.render().as_str()); },
                }
        }
 

diff --git a/src/fields.rs b/src/fields.rs
index 95af99de2c9431d4030aab7f2cbf4c2daf44e687..107de220a55887a384d7b2d8756c6a5169efc9f6 100644 (file)
--- a/src/fields.rs
+++ b/src/fields.rs
@@ -17,9 +17,9 @@ struct Field {
 pub trait TField {
        fn new(name: &str) -> Self;
 
-       fn render(&self) -> String;
-
        fn get_name(&self) -> String;
+
+       fn render(&self) -> String;
 }
 
 #[derive(Default)]

diff --git a/src/form.rs b/src/form.rs
index af93c410b377ed32e4911e1c23a46e2a1266f292..ed88716af7216a772434d4c47b59f7305a658524 100644 (file)
--- a/src/form.rs
+++ b/src/form.rs
@@ -1,3 +1,5 @@
+use super::fields;
+
 pub enum TFields {
        TFieldText(super::fields::FieldText),
        TFieldRadio(super::fields::FieldRadio),