improve api_schema module structure

src/api2.rs

@@ -1,6 +1,6 @@
 //use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 use std::sync::Arc;

src/api2/access.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::tools::ticket::*;
 use crate::auth_helpers::*;

src/api2/admin.rs

@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 

src/api2/admin/datastore.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 //use crate::server::rest::*;
 use serde_json::{json, Value};

src/api2/admin/datastore/catar.rs

@@ -4,7 +4,7 @@ use crate::tools;
 use crate::tools::wrapped_reader_stream::*;
 use crate::backup::*;
 //use crate::server::rest::*;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 
 use chrono::{Utc, TimeZone};

src/api2/config.rs

@@ -1,7 +1,7 @@
 //use failure::*;
 //use std::collections::HashMap;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 

src/api2/config/datastore.rs

@@ -1,7 +1,7 @@
 use failure::*;
 //use std::collections::HashMap;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::backup::*;
 use serde_json::{json, Value};

src/api2/node.rs

@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json};
 

src/api2/node/dns.rs

@@ -3,7 +3,7 @@ use failure::*;
 
 use crate::tools;
 use crate::api2::*;
-//use crate::api_schema::schema::*;
+//use crate::api_schema::*;
 //use crate::api_schema::router::*;
 
 use lazy_static::lazy_static;

src/api2/node/network.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
 //use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api2/node/services.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api2/node/syslog.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api2/node/time.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api2/subscription.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api2/version.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 

src/api_schema.rs

@@ -9,7 +9,9 @@
 //! definition by path.
 
 #[macro_use]
-pub mod schema;
+mod schema;
+pub use schema::*;
+
 pub mod registry;
 #[macro_use]
 pub mod router;

src/api_schema/registry.rs

@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use failure::*;
 use std::collections::HashMap;

src/api_schema/router.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use serde_json::{Value};
 use std::collections::HashMap;
 use std::sync::Arc;

src/bin/catar.rs

@@ -4,7 +4,7 @@ use failure::*;
 
 use proxmox_backup::tools;
 use proxmox_backup::cli::command::*;
-use proxmox_backup::api_schema::schema::*;
+use proxmox_backup::api_schema::*;
 use proxmox_backup::api_schema::router::*;
 
 use serde_json::{Value};

src/bin/proxmox-backup-client.rs

@@ -5,7 +5,7 @@ use failure::*;
 
 use proxmox_backup::tools;
 use proxmox_backup::cli::command::*;
-use proxmox_backup::api_schema::schema::*;
+use proxmox_backup::api_schema::*;
 use proxmox_backup::api_schema::router::*;
 use proxmox_backup::client::*;
 //use proxmox_backup::backup::chunk_store::*;

src/cli/command.rs

@@ -4,7 +4,7 @@ use std::collections::HashSet;
 
 use serde_json::Value;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 //use crate::api_schema::config::*;
 use super::environment::CliEnvironment;

src/client/backup_repo.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use std::sync::Arc;
 use lazy_static::lazy_static;

src/config/datastore.rs

@@ -5,7 +5,7 @@ use std::io::Read;
 
 //use std::sync::Arc;
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use crate::section_config::*;
 

src/getopts.rs

@@ -1,4 +1,4 @@
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 use failure::*;
 

src/section_config.rs

@@ -7,7 +7,7 @@ use std::collections::VecDeque;
 use serde_json::{json, Value};
 
 use std::sync::Arc;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 
 pub struct SectionConfigPlugin {
     type_name: String,

src/server/rest.rs

@@ -1,5 +1,5 @@
 use crate::tools;
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::api_schema::router::*;
 use crate::api_schema::config::*;
 use crate::auth_helpers::*;

src/storage/config.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api_schema::schema::*;
+use crate::api_schema::*;
 use crate::section_config::*;
 
 use lazy_static::lazy_static;