Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

fix missing proxmox_api -> proxmox::api replacement

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-06-08 10:51:41 +02:00
parent cd23e0956a
commit 7155689724
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-api-macro/Cargo.toml
View File

@ -18,7 +18,7 @@ syn = { version = "0.15", features = [ "full" ] }
bytes = "0.4"
futures-preview = { version = "0.3.0-alpha.16", features = [ "compat" ] }
http = "0.1"
proxmox-api = { path = "../proxmox-api" }
proxmox = { path = "../proxmox" }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"

2
proxmox-api-macro/src/api_def.rs
View File

@ -59,7 +59,7 @@ impl ParameterDefinition {
) {
verifiers.push(match self.validate {
Some(ref ident) => quote! { #ident(&#this)?; },
None => quote! { proxmox_api::ApiType::verify(&#this)?; },
None => quote! { ::proxmox::api::ApiType::verify(&#this)?; },
});
if let Some(ref lit) = self.minimum {

7
proxmox-api-macro/tests/basic.rs
View File

@ -6,8 +6,7 @@ use http::Response;
use serde_derive::{Deserialize, Serialize};
use serde_json::Value;
use proxmox_api::Router;
use proxmox_api_macro::api;
use proxmox::api::{api, Router};
#[api({
description: "A hostname or IP address",
@ -69,9 +68,9 @@ async fn get_loopback(param: String) -> Result<String, Error> {
},
returns: String
})]
fn non_async_test(param: String) -> proxmox_api::ApiFuture {
fn non_async_test(param: String) -> proxmox::api::ApiFuture {
Box::pin((async move || {
proxmox_api::IntoApiOutput::into_api_output(param)
proxmox::api::IntoApiOutput::into_api_output(param)
})())
}