tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api: BoxFut -> ApiFuture

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-11-21 14:16:37 +01:00
parent 3d482025b3
commit 2194824f77
6 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api2/admin/datastore.rs
View File

@ -481,7 +481,7 @@ fn download_file(
param: Value,
_info: &ApiMethod,
_rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let store = tools::required_string_param(&param, "store")?;
@ -544,7 +544,7 @@ fn upload_backup_log(
param: Value,
_info: &ApiMethod,
_rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let store = tools::required_string_param(&param, "store")?;

6
src/api2/backup.rs
View File

@ -47,7 +47,7 @@ fn upgrade_to_backup_protocol(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let debug = param["debug"].as_bool().unwrap_or(false);
@ -569,7 +569,7 @@ fn dynamic_chunk_index(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let env: &BackupEnvironment = rpcenv.as_ref();
@ -642,7 +642,7 @@ fn fixed_chunk_index(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let env: &BackupEnvironment = rpcenv.as_ref();

8
src/api2/backup/upload_chunk.rs
View File

@ -115,7 +115,7 @@ fn upload_fixed_chunk(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let wid = tools::required_integer_param(&param, "wid")? as usize;
let size = tools::required_integer_param(&param, "size")? as u32;
@ -177,7 +177,7 @@ fn upload_dynamic_chunk(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let wid = tools::required_integer_param(&param, "wid")? as usize;
let size = tools::required_integer_param(&param, "size")? as u32;
@ -218,7 +218,7 @@ fn upload_speedtest(
_param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let resp = req_body
.map_err(Error::from)
@ -265,7 +265,7 @@ fn upload_blob(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let file_name = tools::required_string_param(&param, "file-name")?.to_owned();
let encoded_size = tools::required_integer_param(&param, "encoded-size")? as usize;

10
src/api2/reader.rs
View File

@ -50,7 +50,7 @@ fn upgrade_to_backup_reader_protocol(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let debug = param["debug"].as_bool().unwrap_or(false);
@ -171,7 +171,7 @@ fn download_file(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let env: &ReaderEnvironment = rpcenv.as_ref();
let env2 = env.clone();
@ -222,7 +222,7 @@ fn download_chunk(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let env: &ReaderEnvironment = rpcenv.as_ref();
@ -258,7 +258,7 @@ fn download_chunk_old(
param: Value,
_info: &ApiMethod,
rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let env: &ReaderEnvironment = rpcenv.as_ref();
let env2 = env.clone();
@ -303,7 +303,7 @@ fn speedtest(
_param: Value,
_info: &ApiMethod,
_rpcenv: Box<dyn RpcEnvironment>,
) -> Result<BoxFut, Error> {
) -> Result<ApiFuture, Error> {
let buffer = vec![65u8; 1024*1024]; // nonsense [A,A,A...]

4
src/api_schema.rs
View File

@ -22,10 +22,8 @@ pub mod format;
pub use proxmox::api::schema::*;
pub use proxmox::api::*;
pub use proxmox::api::ApiFuture as BoxFut;
pub mod api_handler {
pub use super::{ApiAsyncHandlerFn, ApiHandler, ApiHandlerFn, BoxFut};
pub use super::{ApiAsyncHandlerFn, ApiHandler, ApiHandlerFn, ApiFuture};
}
pub mod router {

10
src/server/rest.rs
View File

@ -229,7 +229,7 @@ fn proxy_protected_request(
info: &'static ApiMethod,
mut parts: Parts,
req_body: Body,
) -> BoxFut {
) -> ApiFuture {
let mut uri_parts = parts.uri.clone().into_parts();
@ -269,7 +269,7 @@ pub fn handle_sync_api_request<Env: RpcEnvironment, S: 'static + BuildHasher + S
parts: Parts,
req_body: Body,
uri_param: HashMap<String, String, S>,
) -> BoxFut
) -> ApiFuture
{
let handler = match info.handler {
ApiHandler::Async(_) => {
@ -322,7 +322,7 @@ pub fn handle_async_api_request<Env: RpcEnvironment>(
parts: Parts,
req_body: Body,
uri_param: HashMap<String, String>,
) -> BoxFut
) -> ApiFuture
{
let handler = match info.handler {
ApiHandler::Sync(_) => {
@ -489,7 +489,7 @@ async fn chuncked_static_file_download(filename: PathBuf) -> Result<Response<Bod
)
}
fn handle_static_file_download(filename: PathBuf) -> BoxFut {
fn handle_static_file_download(filename: PathBuf) -> ApiFuture {
let response = tokio::fs::metadata(filename.clone())
.map_err(|err| http_err!(BAD_REQUEST, format!("File access problems: {}", err)))
@ -554,7 +554,7 @@ async fn delayed_response(
Ok(resp)
}
pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> BoxFut {
pub fn handle_request(api: Arc<ApiConfig>, req: Request<Body>) -> ApiFuture {
let (parts, body) = req.into_parts();