From ff17bf5a2b0cd357805869137d9db635eb227d9a Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 17 Jul 2024 14:27:16 +0200
Subject: [PATCH] router: don't deprecate generate_usage_str

This is used for the 'debug' binary to show the usage of an API
method.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 proxmox-router/debian/control    | 26 +++++++++++++-------------
 proxmox-router/src/cli/format.rs |  1 -
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/proxmox-router/debian/control b/proxmox-router/debian/control
index bbb72752..e38aa881 100644
--- a/proxmox-router/debian/control
+++ b/proxmox-router/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 12),
  librust-percent-encoding-2+default-dev (>= 2.1-~~) <!nocheck>,
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~) <!nocheck>,
  librust-proxmox-http-error-0.1+default-dev <!nocheck>,
- librust-proxmox-schema-3+default-dev (>= 3.1.1-~~) <!nocheck>,
+ librust-proxmox-schema-3+default-dev (>= 3.1.2-~~) <!nocheck>,
  librust-regex-1+default-dev (>= 1.5-~~) <!nocheck>,
  librust-rustyline-9+default-dev <!nocheck>,
  librust-serde-1+default-dev <!nocheck>,
@@ -40,7 +40,7 @@ Depends:
  librust-percent-encoding-2+default-dev (>= 2.1-~~),
  librust-proxmox-async-0.4+default-dev (>= 0.4.1-~~),
  librust-proxmox-http-error-0.1+default-dev,
- librust-proxmox-schema-3+default-dev (>= 3.1.1-~~),
+ librust-proxmox-schema-3+default-dev (>= 3.1.2-~~),
  librust-serde-1+default-dev,
  librust-serde-json-1+default-dev,
  librust-unicode-width-0.1+default-dev (>= 0.1.8-~~)
@@ -52,8 +52,8 @@ Suggests:
  librust-proxmox-router+test-harness-dev (= ${binary:Version})
 Provides:
  librust-proxmox-router-2-dev (= ${binary:Version}),
- librust-proxmox-router-2.1-dev (= ${binary:Version}),
- librust-proxmox-router-2.1.5-dev (= ${binary:Version})
+ librust-proxmox-router-2.2-dev (= ${binary:Version}),
+ librust-proxmox-router-2.2.0-dev (= ${binary:Version})
 Description: Proxmox API Router and CLI utilities - Rust source code
  Source code for Debianized Rust crate "proxmox-router"
 
@@ -70,8 +70,8 @@ Depends:
  librust-tokio-1+default-dev (>= 1.6-~~)
 Provides:
  librust-proxmox-router-2+cli-dev (= ${binary:Version}),
- librust-proxmox-router-2.1+cli-dev (= ${binary:Version}),
- librust-proxmox-router-2.1.5+cli-dev (= ${binary:Version})
+ librust-proxmox-router-2.2+cli-dev (= ${binary:Version}),
+ librust-proxmox-router-2.2.0+cli-dev (= ${binary:Version})
 Description: Proxmox API Router and CLI utilities - feature "cli"
  This metapackage enables feature "cli" for the Rust proxmox-router crate, by
  pulling in any additional dependencies needed by that feature.
@@ -86,8 +86,8 @@ Depends:
  librust-proxmox-router+server-dev (= ${binary:Version})
 Provides:
  librust-proxmox-router-2+default-dev (= ${binary:Version}),
- librust-proxmox-router-2.1+default-dev (= ${binary:Version}),
- librust-proxmox-router-2.1.5+default-dev (= ${binary:Version})
+ librust-proxmox-router-2.2+default-dev (= ${binary:Version}),
+ librust-proxmox-router-2.2.0+default-dev (= ${binary:Version})
 Description: Proxmox API Router and CLI utilities - feature "default"
  This metapackage enables feature "default" for the Rust proxmox-router crate,
  by pulling in any additional dependencies needed by that feature.
@@ -103,8 +103,8 @@ Depends:
  librust-hyper-0.14+full-dev (>= 0.14.5-~~)
 Provides:
  librust-proxmox-router-2+server-dev (= ${binary:Version}),
- librust-proxmox-router-2.1+server-dev (= ${binary:Version}),
- librust-proxmox-router-2.1.5+server-dev (= ${binary:Version})
+ librust-proxmox-router-2.2+server-dev (= ${binary:Version}),
+ librust-proxmox-router-2.2.0+server-dev (= ${binary:Version})
 Description: Proxmox API Router and CLI utilities - feature "server"
  This metapackage enables feature "server" for the Rust proxmox-router crate, by
  pulling in any additional dependencies needed by that feature.
@@ -115,11 +115,11 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  librust-proxmox-router-dev (= ${binary:Version}),
- librust-proxmox-schema-3+test-harness-dev (>= 3.1.1-~~)
+ librust-proxmox-schema-3+test-harness-dev (>= 3.1.2-~~)
 Provides:
  librust-proxmox-router-2+test-harness-dev (= ${binary:Version}),
- librust-proxmox-router-2.1+test-harness-dev (= ${binary:Version}),
- librust-proxmox-router-2.1.5+test-harness-dev (= ${binary:Version})
+ librust-proxmox-router-2.2+test-harness-dev (= ${binary:Version}),
+ librust-proxmox-router-2.2.0+test-harness-dev (= ${binary:Version})
 Description: Proxmox API Router and CLI utilities - feature "test-harness"
  This metapackage enables feature "test-harness" for the Rust proxmox-router
  crate, by pulling in any additional dependencies needed by that feature.
diff --git a/proxmox-router/src/cli/format.rs b/proxmox-router/src/cli/format.rs
index b3d2aa75..6f0ec50c 100644
--- a/proxmox-router/src/cli/format.rs
+++ b/proxmox-router/src/cli/format.rs
@@ -57,7 +57,6 @@ pub fn format_and_print_result_full(
     }
 }
 
-#[deprecated = "to be removed, not meant as a public interface"]
 /// Helper to generate command usage text for simple commands.
 pub fn generate_usage_str(
     prefix: &str,