Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add must_use to Error constructors #229

Merged
merged 5 commits into from Mar 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/ensure.rs
Expand Up @@ -818,17 +818,17 @@ macro_rules! __fallback_ensure {
};
($cond:expr, $msg:literal $(,)?) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($msg));
return $crate::private::Err($crate::__anyhow!($msg));
}
};
($cond:expr, $err:expr $(,)?) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($err));
return $crate::private::Err($crate::__anyhow!($err));
}
};
($cond:expr, $fmt:expr, $($arg:tt)*) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($fmt, $($arg)*));
return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*));
}
};
}
3 changes: 3 additions & 0 deletions src/error.rs
Expand Up @@ -26,6 +26,7 @@ impl Error {
#[cfg(feature = "std")]
#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))]
#[cold]
#[must_use]
pub fn new<E>(error: E) -> Self
where
E: StdError + Send + Sync + 'static,
Expand Down Expand Up @@ -72,6 +73,7 @@ impl Error {
/// }
/// ```
#[cold]
#[must_use]
pub fn msg<M>(message: M) -> Self
where
M: Display + Debug + Send + Sync + 'static,
Expand Down Expand Up @@ -293,6 +295,7 @@ impl Error {
/// }
/// ```
#[cold]
#[must_use]
pub fn context<C>(self, context: C) -> Self
where
C: Display + Send + Sync + 'static,
Expand Down
8 changes: 8 additions & 0 deletions src/lib.rs
Expand Up @@ -668,4 +668,12 @@ pub mod private {
Error::msg(fmt::format(args))
}
}

#[doc(hidden)]
#[inline]
#[cold]
#[must_use]
pub fn must_use(error: Error) -> Error {
error
}
}
44 changes: 35 additions & 9 deletions src/macros.rs
Expand Up @@ -54,13 +54,13 @@
#[macro_export]
macro_rules! bail {
($msg:literal $(,)?) => {
return $crate::private::Err($crate::anyhow!($msg))
return $crate::private::Err($crate::__anyhow!($msg))
};
($err:expr $(,)?) => {
return $crate::private::Err($crate::anyhow!($err))
return $crate::private::Err($crate::__anyhow!($err))
};
($fmt:expr, $($arg:tt)*) => {
return $crate::private::Err($crate::anyhow!($fmt, $($arg)*))
return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*))
};
}

Expand All @@ -75,13 +75,13 @@ macro_rules! bail {
return $crate::private::Err($crate::Error::msg("pattern does not contain `{}`"))
};
($msg:literal $(,)?) => {
return $crate::private::Err($crate::anyhow!($msg))
return $crate::private::Err($crate::__anyhow!($msg))
};
($err:expr $(,)?) => {
return $crate::private::Err($crate::anyhow!($err))
return $crate::private::Err($crate::__anyhow!($err))
};
($fmt:expr, $($arg:tt)*) => {
return $crate::private::Err($crate::anyhow!($fmt, $($arg)*))
return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*))
};
}

Expand Down Expand Up @@ -145,17 +145,17 @@ macro_rules! ensure {
};
($cond:expr, $msg:literal $(,)?) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($msg));
return $crate::private::Err($crate::__anyhow!($msg));
}
};
($cond:expr, $err:expr $(,)?) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($err));
return $crate::private::Err($crate::__anyhow!($err));
}
};
($cond:expr, $fmt:expr, $($arg:tt)*) => {
if !$cond {
return $crate::private::Err($crate::anyhow!($fmt, $($arg)*));
return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*));
}
};
}
Expand Down Expand Up @@ -206,6 +206,32 @@ macro_rules! ensure {
/// ```
#[macro_export]
macro_rules! anyhow {
($msg:literal $(,)?) => {
$crate::private::must_use({
let error = $crate::private::format_err($crate::private::format_args!($msg));
error
})
};
($err:expr $(,)?) => {
$crate::private::must_use({
use $crate::private::kind::*;
let error = match $err {
error => (&error).anyhow_kind().new(error),
};
error
})
};
($fmt:expr, $($arg:tt)*) => {
$crate::Error::msg($crate::private::format!($fmt, $($arg)*))
};
}

// Not public API. This is used in the implementation of some of the other
// macros, in which the must_use call is not needed because the value is known
// to be used.
#[doc(hidden)]
#[macro_export]
macro_rules! __anyhow {
($msg:literal $(,)?) => ({
let error = $crate::private::format_err($crate::private::format_args!($msg));
error
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/must-use.rs
@@ -0,0 +1,11 @@
#![deny(unused_must_use)]

use anyhow::anyhow;

fn main() -> anyhow::Result<()> {
if true {
// meant to write bail!
anyhow!("it failed");
}
Ok(())
}
12 changes: 12 additions & 0 deletions tests/ui/must-use.stderr
@@ -0,0 +1,12 @@
error: unused return value of `must_use` that must be used
--> tests/ui/must-use.rs:8:9
|
8 | anyhow!("it failed");
| ^^^^^^^^^^^^^^^^^^^^
|
note: the lint level is defined here
--> tests/ui/must-use.rs:1:9
|
1 | #![deny(unused_must_use)]
| ^^^^^^^^^^^^^^^
= note: this error originates in the macro `anyhow` (in Nightly builds, run with -Z macro-backtrace for more info)