Merging upstream version 1.75.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 13 insertions, 2 deletions

diff --git a/vendor/color-print-proc-macro/src/lib.rs b/vendor/color-print-proc-macro/src/lib.rs
index 51d8c5f30..6f60056ab 100644
--- a/vendor/color-print-proc-macro/src/lib.rs
+++ b/vendor/color-print-proc-macro/src/lib.rs
@@ -87,7 +87,8 @@ pub fn cprintln(input: TokenStream) -> TokenStream {
 
 /// Colorizes a string literal, without formatting the `format!`-like placeholders.
 ///
-/// Accepts only one argument.
+/// * Accepts only one argument;
+/// * Will panic if feature `terminfo` is activated.
 ///
 /// #### Example
 ///
@@ -122,6 +123,16 @@ pub fn untagged(input: TokenStream) -> TokenStream {
         .into()
 }
 
+/// Colorizes a string literal, without formatting the `format!`-like placeholders.
+///
+/// * Accepts only one argument;
+/// * Will panic if feature `terminfo` is activated.
+#[cfg(feature = "terminfo")]
+#[proc_macro]
+pub fn cstr(_: TokenStream) -> TokenStream {
+    panic!("Macro cstr!() cannot be used with terminfo feature")
+}
+
 /// Renders a whole processed macro.
 fn get_macro(macro_name: &str, input: TokenStream) -> TokenStream {
     #[cfg(not(feature = "terminfo"))]
diff --git a/vendor/color-print-proc-macro/src/untagged.rs b/vendor/color-print-proc-macro/src/untagged.rs
index feaa7edda..4e7ec4255 100644
--- a/vendor/color-print-proc-macro/src/untagged.rs
+++ b/vendor/color-print-proc-macro/src/untagged.rs
@@ -1,4 +1,4 @@
-//! Implements the [`untagged!()`] proc macro.
+//! Implements the [`crate::untagged!()`] proc macro.
 
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;