konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

api/compat: drop more compat imports from api_schema.rs

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-11-21 14:36:28 +01:00
parent 13f6a30f52
commit ac21864dcf
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/environment.rs
View File

@ -1,8 +1,8 @@
use crate::api_schema::router::*;
use std::collections::HashMap; use std::collections::HashMap;
use serde_json::Value; use serde_json::Value;
use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
/// Encapsulates information about the runtime environment /// Encapsulates information about the runtime environment
pub struct RestEnvironment { pub struct RestEnvironment {
env_type: RpcEnvironmentType, env_type: RpcEnvironmentType,

4
src/server/formatter.rs
View File

@ -1,11 +1,11 @@
use failure::*; use failure::*;
use serde_json::{json, Value}; use serde_json::{json, Value};
use crate::api_schema::router::{HttpError, RpcEnvironment};
use hyper::{Body, Response, StatusCode}; use hyper::{Body, Response, StatusCode};
use hyper::header; use hyper::header;
use proxmox::api::{HttpError, RpcEnvironment};
/// Extension to set error message for server side logging /// Extension to set error message for server side logging
pub struct ErrorMessageExtension(pub String); pub struct ErrorMessageExtension(pub String);

3
src/server/h2service.rs
View File

@ -7,10 +7,9 @@ use std::task::{Context, Poll};
use futures::*; use futures::*;
use hyper::{Body, Request, Response, StatusCode}; use hyper::{Body, Request, Response, StatusCode};
use proxmox::api::{http_err, ApiFuture}; use proxmox::api::{http_err, ApiFuture, ApiHandler, HttpError, Router, RpcEnvironment};
use crate::tools; use crate::tools;
use crate::api_schema::router::*;
use crate::server::formatter::*; use crate::server::formatter::*;
use crate::server::WorkerTask; use crate::server::WorkerTask;

10
src/server/rest.rs
View File

@ -16,13 +16,15 @@ use serde_json::{json, Value};
use tokio::fs::File; use tokio::fs::File;
use url::form_urlencoded; use url::form_urlencoded;
use proxmox::api::http_err;
use proxmox::api::{ApiFuture, ApiHandler, ApiMethod, HttpError};
use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
use proxmox::api::schema::{parse_simple_value, verify_json_object, parse_parameter_strings};
use super::environment::RestEnvironment; use super::environment::RestEnvironment;
use super::formatter::*; use super::formatter::*;
use crate::api_schema::rpc_environment::*;
use crate::api_schema::config::*;
use crate::api_schema::router::*;
use crate::api_schema::*;
use crate::auth_helpers::*; use crate::auth_helpers::*;
use crate::api_schema::config::ApiConfig;
use crate::tools; use crate::tools;
extern "C" { fn tzset(); } extern "C" { fn tzset(); }