rename src/api to src/api_schema

src/api2.rs

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

src/api2/access.rs

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

src/api2/admin.rs

@@ -1,5 +1,5 @@
-use crate::api::schema::*;
-use crate::api::router::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
 use serde_json::{json};
 
 pub mod datastore;

src/api2/admin/datastore.rs

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

src/api2/admin/datastore/catar.rs

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

src/api2/config.rs

@@ -1,8 +1,8 @@
 //use failure::*;
 //use std::collections::HashMap;
 
-use crate::api::schema::*;
-use crate::api::router::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
 use serde_json::{json};
 
 pub mod datastore;

src/api2/config/datastore.rs

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

src/api2/node.rs

@@ -1,5 +1,5 @@
-use crate::api::schema::*;
-use crate::api::router::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
 use serde_json::{json};
 
 mod time;

src/api2/node/dns.rs

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

src/api2/node/network.rs

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

src/api2/node/services.rs

@@ -1,8 +1,8 @@
 use failure::*;
 
 use crate::tools;
-use crate::api::schema::*;
-use crate::api::router::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
 use std::sync::Arc;

src/api2/node/syslog.rs

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

src/api2/node/time.rs

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

src/api2/subscription.rs

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

src/api2/version.rs

@@ -1,7 +1,7 @@
 use failure::*;
 
-use crate::api::schema::*;
-use crate::api::router::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
 const PROXMOX_PKG_VERSION: &'static str = env!("PROXMOX_PKG_VERSION");

src/api_schema.rs

@@ -0,0 +1,16 @@
+//! API definition helper
+//!
+//! This module contains helper classes to define REST APIs. Method
+//! parameters and return types are described using a
+//! [Schema](schema/enum.Schema.html).
+//!
+//! The [Router](router/struct.Router.html) is used to define a
+//! hierarchy of API entries, and provides ways to find an API
+//! definition by path.
+
+#[macro_use]
+pub mod schema;
+pub mod registry;
+#[macro_use]
+pub mod router;
+pub mod config;

src/api_schema/config.rs

@@ -1,4 +1,4 @@
-use crate::api::router::*;
+use crate::api_schema::router::*;
 
 use std::collections::HashMap;
 use std::path::{PathBuf};

src/api_schema/registry.rs

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

src/api_schema/router.rs

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

src/bin/catar.rs

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

src/bin/proxmox-backup-api.rs

@@ -1,8 +1,8 @@
 extern crate proxmox_backup;
 
 //use proxmox_backup::tools;
-use proxmox_backup::api::router::*;
-use proxmox_backup::api::config::*;
+use proxmox_backup::api_schema::router::*;
+use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::auth_helpers::*;
 use proxmox_backup::config;

src/bin/proxmox-backup-client.rs

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

src/bin/proxmox-backup-proxy.rs

@@ -2,8 +2,8 @@
 extern crate proxmox_backup;
 
 use proxmox_backup::tools;
-use proxmox_backup::api::router::*;
-use proxmox_backup::api::config::*;
+use proxmox_backup::api_schema::router::*;
+use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::auth_helpers::*;
 

src/cli/command.rs

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

src/cli/environment.rs

@@ -1,4 +1,4 @@
-use crate::api::router::*;
+use crate::api_schema::router::*;
 
 use std::collections::HashMap;
 use serde_json::Value;

src/client/backup_repo.rs

@@ -1,6 +1,6 @@
 use failure::*;
 
-use crate::api::schema::*;
+use crate::api_schema::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::*;
+use crate::api_schema::schema::*;
 
 use crate::section_config::*;
 

src/getopts.rs

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

src/lib.rs

@@ -4,26 +4,8 @@ pub mod buildcfg;
 #[macro_use]
 pub mod tools;
 
-/// API definition helper
-///
-/// This module contains helper classes to define REST APIs. Method
-/// parameters and return types are described using a
-/// [Schema](schema/enum.Schema.html).
-///
-/// The [Router](router/struct.Router.html) is used to define a
-/// hierarchy of API entries, and provides ways to find an API
-/// definition by path.
-
 #[macro_use]
-pub mod api {
-
-    #[macro_use]
-    pub mod schema;
-    pub mod registry;
-    #[macro_use]
-    pub mod router;
-    pub mod config;
-}
+pub mod api_schema;
 
 #[macro_use]
 pub mod server {

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::*;
+use crate::api_schema::schema::*;
 
 pub struct SectionConfigPlugin {
     type_name: String,

src/server/environment.rs

@@ -1,4 +1,4 @@
-use crate::api::router::*;
+use crate::api_schema::router::*;
 
 use std::collections::HashMap;
 use serde_json::Value;

src/server/formatter.rs

@@ -1,7 +1,7 @@
 use failure::*;
 use serde_json::{json, Value};
 
-use crate::api::router::RpcEnvironment;
+use crate::api_schema::router::RpcEnvironment;
 
 use hyper::{Body, Response, StatusCode};
 use hyper::header;

src/server/rest.rs

@@ -1,7 +1,7 @@
 use crate::tools;
-use crate::api::schema::*;
-use crate::api::router::*;
-use crate::api::config::*;
+use crate::api_schema::schema::*;
+use crate::api_schema::router::*;
+use crate::api_schema::config::*;
 use crate::auth_helpers::*;
 use super::environment::RestEnvironment;
 use super::formatter::*;

src/storage/config.rs

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