tree-wide: use is_empty() and similar

[proxmox-backup.git] / src / bin / docgen.rs

diff --git a/src/bin/docgen.rs b/src/bin/docgen.rs
index b54e418531288f303c867989e1d068533e2eb50b..5600da14a374267838bf102ac691182ca6859972 100644 (file)
--- a/src/bin/docgen.rs
+++ b/src/bin/docgen.rs
@@ -1,33 +1,14 @@
 use anyhow::{bail, Error};
 use serde_json::{json, Value};
 
-use proxmox::{
-    api::{
-        schema::{
-            ApiType,
-            Schema,
-            ObjectSchemaType,
-            ApiStringFormat,
-        },
-        router::{
-             ApiAccess,
-        },
-        format::{
-            dump_enum_properties,
-            dump_section_config,
-            get_property_string_type_text,
-        },
-        ApiMethod,
-        ApiHandler,
-        Router,
-        SubRoute,
-        Permission,
-    },
-};
+use proxmox_router::{ApiAccess, ApiHandler, ApiMethod, Permission, Router, SubRoute};
+use proxmox_schema::format::{dump_enum_properties, get_property_string_type_text};
+use proxmox_schema::{ApiStringFormat, ApiType, ObjectSchemaType, Schema};
+use proxmox_section_config::dump_section_config;
 
 use pbs_api_types::PRIVILEGES;
 
-use proxmox_backup::{api2, config};
+use proxmox_backup::api2;
 
 fn get_args() -> (String, Vec<String>) {
 
@@ -43,17 +24,17 @@ fn main() -> Result<(), Error> {
 
     let (_prefix, args) = get_args();
 
-    if args.len() < 1 {
+    if args.is_empty() {
         bail!("missing arguments");
     }
 
     for arg in args.iter() {
         let text = match arg.as_ref() {
             "apidata.js" => generate_api_tree(),
-            "datastore.cfg" => dump_section_config(&config::datastore::CONFIG),
+            "datastore.cfg" => dump_section_config(&pbs_config::datastore::CONFIG),
             "tape.cfg" => dump_section_config(&pbs_config::drive::CONFIG),
             "tape-job.cfg" => dump_section_config(&pbs_config::tape_job::CONFIG),
-            "user.cfg" => dump_section_config(&config::user::CONFIG),
+            "user.cfg" => dump_section_config(&pbs_config::user::CONFIG),
             "remote.cfg" => dump_section_config(&pbs_config::remote::CONFIG),
             "sync.cfg" => dump_section_config(&pbs_config::sync::CONFIG),
             "verification.cfg" => dump_section_config(&pbs_config::verify::CONFIG),
@@ -289,7 +270,7 @@ fn dump_api_method_schema(
 
     data["parameters"] = dump_property_schema(&api_method.parameters);
 
-    let mut returns = dump_schema(&api_method.returns.schema);
+    let mut returns = dump_schema(api_method.returns.schema);
     if api_method.returns.optional {
         returns["optional"] = 1.into();
     }