From 6b5dc96c7dad65af1036fc431caefcff636dd818 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 21 Jan 2020 12:28:01 +0100
Subject: [PATCH] bump proxmox crate to 0.1.7

The -sys, -tools and -api crate have now been merged into
the proxmx crate directly. Only macro crates are separate
(but still reexported by the proxmox crate in their
designated locations).

When we need to depend on "parts" of the crate later on
we'll just have to use features.

The reason is mostly that these modules had
inter-dependencies which really make them not independent
enough to be their own crates.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 src/server/h2service.rs | 3 ++-
 src/server/rest.rs      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/server/h2service.rs b/src/server/h2service.rs
index 982618d6..8682dc8d 100644
--- a/src/server/h2service.rs
+++ b/src/server/h2service.rs
@@ -7,7 +7,8 @@ use std::task::{Context, Poll};
 use futures::*;
 use hyper::{Body, Request, Response, StatusCode};
 
-use proxmox::api::{http_err, ApiResponseFuture, HttpError, Router, RpcEnvironment};
+use proxmox::api::{ApiResponseFuture, HttpError, Router, RpcEnvironment};
+use proxmox::http_err;
 
 use crate::tools;
 use crate::server::formatter::*;
diff --git a/src/server/rest.rs b/src/server/rest.rs
index 54cef749..5383fc77 100644
--- a/src/server/rest.rs
+++ b/src/server/rest.rs
@@ -17,7 +17,7 @@ use tokio::fs::File;
 use tokio::time::Instant;
 use url::form_urlencoded;
 
-use proxmox::api::http_err;
+use proxmox::http_err;
 use proxmox::api::{ApiHandler, ApiMethod, HttpError};
 use proxmox::api::{RpcEnvironment, RpcEnvironmentType};
 use proxmox::api::schema::{ObjectSchema, parse_simple_value, verify_json_object, parse_parameter_strings};