From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 19 Jun 2024 11:26:03 +0200
Subject: Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/tools/cargo/credential/cargo-credential-1password/Cargo.toml     | 3 +++
 src/tools/cargo/credential/cargo-credential-1password/src/main.rs    | 3 +++
 src/tools/cargo/credential/cargo-credential-libsecret/Cargo.toml     | 5 ++++-
 .../cargo/credential/cargo-credential-macos-keychain/Cargo.toml      | 5 ++++-
 .../cargo/credential/cargo-credential-macos-keychain/src/lib.rs      | 2 ++
 src/tools/cargo/credential/cargo-credential-wincred/Cargo.toml       | 5 ++++-
 src/tools/cargo/credential/cargo-credential/Cargo.toml               | 5 ++++-
 .../cargo/credential/cargo-credential/examples/stdout-redirected.rs  | 3 +++
 src/tools/cargo/credential/cargo-credential/src/lib.rs               | 3 +++
 9 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'src/tools/cargo/credential')

diff --git a/src/tools/cargo/credential/cargo-credential-1password/Cargo.toml b/src/tools/cargo/credential/cargo-credential-1password/Cargo.toml
index 9e5b1e635..3024bd497 100644
--- a/src/tools/cargo/credential/cargo-credential-1password/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential-1password/Cargo.toml
@@ -11,3 +11,6 @@ description = "A Cargo credential process that stores tokens in a 1password vaul
 cargo-credential.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
+
+[lints]
+workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential-1password/src/main.rs b/src/tools/cargo/credential/cargo-credential-1password/src/main.rs
index 321a99c51..38b567bf2 100644
--- a/src/tools/cargo/credential/cargo-credential-1password/src/main.rs
+++ b/src/tools/cargo/credential/cargo-credential-1password/src/main.rs
@@ -1,5 +1,8 @@
 //! Cargo registry 1password credential process.
 
+#![allow(clippy::disallowed_methods)]
+#![allow(clippy::print_stderr)]
+
 use cargo_credential::{
     Action, CacheControl, Credential, CredentialResponse, Error, RegistryInfo, Secret,
 };
diff --git a/src/tools/cargo/credential/cargo-credential-libsecret/Cargo.toml b/src/tools/cargo/credential/cargo-credential-libsecret/Cargo.toml
index 19ef33a34..e68c9b83a 100644
--- a/src/tools/cargo/credential/cargo-credential-libsecret/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential-libsecret/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-libsecret"
-version = "0.4.1"
+version = "0.4.2"
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
@@ -11,3 +11,6 @@ description = "A Cargo credential process that stores tokens with GNOME libsecre
 anyhow.workspace = true
 cargo-credential.workspace = true
 libloading.workspace = true
+
+[lints]
+workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential-macos-keychain/Cargo.toml b/src/tools/cargo/credential/cargo-credential-macos-keychain/Cargo.toml
index 4dec8def6..95ffa231f 100644
--- a/src/tools/cargo/credential/cargo-credential-macos-keychain/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential-macos-keychain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-macos-keychain"
-version = "0.4.1"
+version = "0.4.2"
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
@@ -12,3 +12,6 @@ cargo-credential.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
 security-framework.workspace = true
+
+[lints]
+workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential-macos-keychain/src/lib.rs b/src/tools/cargo/credential/cargo-credential-macos-keychain/src/lib.rs
index 9e6d55472..8a702a362 100644
--- a/src/tools/cargo/credential/cargo-credential-macos-keychain/src/lib.rs
+++ b/src/tools/cargo/credential/cargo-credential-macos-keychain/src/lib.rs
@@ -1,5 +1,7 @@
 //! Cargo registry macos keychain credential process.
 
+#![allow(clippy::print_stderr)]
+
 #[cfg(target_os = "macos")]
 mod macos {
     use cargo_credential::{
diff --git a/src/tools/cargo/credential/cargo-credential-wincred/Cargo.toml b/src/tools/cargo/credential/cargo-credential-wincred/Cargo.toml
index c904075bb..1ecb2a7be 100644
--- a/src/tools/cargo/credential/cargo-credential-wincred/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential-wincred/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-wincred"
-version = "0.4.1"
+version = "0.4.2"
 edition.workspace = true
 license.workspace = true
 rust-version.workspace = true
@@ -13,3 +13,6 @@ cargo-credential.workspace = true
 [target.'cfg(windows)'.dependencies.windows-sys]
 features = ["Win32_Foundation", "Win32_Security_Credentials"]
 workspace = true
+
+[lints]
+workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
index 8ba65b8b9..7dc37ff82 100644
--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential"
-version = "0.4.1"
+version = "0.4.2"
 edition.workspace = true
 license.workspace = true
 rust-version = "1.70.0"  # MSRV:3
@@ -20,3 +20,6 @@ windows-sys = { workspace = true, features = ["Win32_System_Console", "Win32_Fou
 
 [dev-dependencies]
 snapbox = { workspace = true, features = ["examples"] }
+
+[lints]
+workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential/examples/stdout-redirected.rs b/src/tools/cargo/credential/cargo-credential/examples/stdout-redirected.rs
index 75a2d16d1..fb7c0446c 100644
--- a/src/tools/cargo/credential/cargo-credential/examples/stdout-redirected.rs
+++ b/src/tools/cargo/credential/cargo-credential/examples/stdout-redirected.rs
@@ -1,5 +1,8 @@
 //! Provider used for testing redirection of stdout.
 
+#![allow(clippy::print_stderr)]
+#![allow(clippy::print_stdout)]
+
 use cargo_credential::{Action, Credential, CredentialResponse, Error, RegistryInfo};
 
 struct MyCredential;
diff --git a/src/tools/cargo/credential/cargo-credential/src/lib.rs b/src/tools/cargo/credential/cargo-credential/src/lib.rs
index 60bce65be..0888fb402 100644
--- a/src/tools/cargo/credential/cargo-credential/src/lib.rs
+++ b/src/tools/cargo/credential/cargo-credential/src/lib.rs
@@ -37,6 +37,9 @@
 #![doc = include_str!("../examples/file-provider.rs")]
 //! ```
 
+#![allow(clippy::print_stderr)]
+#![allow(clippy::print_stdout)]
+
 use serde::{Deserialize, Serialize};
 use std::{fmt::Display, io};
 use time::OffsetDateTime;
-- 
cgit v1.2.3