From 2e00214b3efbdfeefaa0fe9e8b8fd519de7adc35 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:50 +0200 Subject: Merging upstream version 1.69.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/icu_provider/src/error.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vendor/icu_provider/src/error.rs') diff --git a/vendor/icu_provider/src/error.rs b/vendor/icu_provider/src/error.rs index 39bd1d0bb..05a48f9b7 100644 --- a/vendor/icu_provider/src/error.rs +++ b/vendor/icu_provider/src/error.rs @@ -64,8 +64,8 @@ pub enum DataErrorKind { MissingSourceData, /// An error indicating that the desired buffer format is not available. This usually - /// means that a required feature was not enabled - #[displaydoc("Unavailable buffer format: {0:?} (does icu_provider need to be compiled with an additional feature?)")] + /// means that a required Cargo feature was not enabled + #[displaydoc("Unavailable buffer format: {0:?} (does icu_provider need to be compiled with an additional Cargo feature?)")] UnavailableBufferFormat(BufferFormat), } @@ -196,7 +196,7 @@ impl DataError { /// Logs the data error with the given request, returning an error containing the resource key. /// - /// If the "log_error_context" feature is enabled, this logs the whole request. Either way, + /// If the "log_error_context" Cargo feature is enabled, this logs the whole request. Either way, /// it returns an error with the resource key portion of the request as context. #[cfg_attr(not(feature = "log_error_context"), allow(unused_variables))] pub fn with_req(self, key: DataKey, req: DataRequest) -> Self { @@ -210,7 +210,7 @@ impl DataError { /// Logs the data error with the given context, then return self. /// - /// This does not modify the error, but if the "log_error_context" feature is enabled, + /// This does not modify the error, but if the "log_error_context" Cargo feature is enabled, /// it will print out the context. #[cfg(feature = "std")] #[cfg_attr(not(feature = "log_error_context"), allow(unused_variables))] @@ -222,7 +222,7 @@ impl DataError { /// Logs the data error with the given context, then return self. /// - /// This does not modify the error, but if the "log_error_context" feature is enabled, + /// This does not modify the error, but if the "log_error_context" Cargo feature is enabled, /// it will print out the context. #[cfg_attr(not(feature = "log_error_context"), allow(unused_variables))] #[inline] @@ -234,7 +234,7 @@ impl DataError { /// Logs the data error with the given context, then return self. /// - /// This does not modify the error, but if the "log_error_context" feature is enabled, + /// This does not modify the error, but if the "log_error_context" Cargo feature is enabled, /// it will print out the context. #[cfg_attr(not(feature = "log_error_context"), allow(unused_variables))] #[inline] -- cgit v1.2.3