From 4481e6e4cb187ca7e20e1b67bcd8c82e515fdd1e Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 8 Dec 2022 09:55:43 +0200 Subject: [PATCH] clippy fixes --- pageserver/src/config.rs | 5 ++--- pageserver/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pageserver/src/config.rs b/pageserver/src/config.rs index 51f3474da1..05ac30b58c 100644 --- a/pageserver/src/config.rs +++ b/pageserver/src/config.rs @@ -713,9 +713,8 @@ fn parse_toml_string(name: &str, item: &Item) -> Result { } fn parse_toml_bool(name: &str, item: &Item) -> Result { - Ok(item - .as_bool() - .with_context(|| format!("configure option {name} is not a boolean"))?) + item.as_bool() + .with_context(|| format!("configure option {name} is not a boolean")) } fn parse_toml_u64(name: &str, item: &Item) -> Result { diff --git a/pageserver/src/lib.rs b/pageserver/src/lib.rs index ea6f709456..402d410bbc 100644 --- a/pageserver/src/lib.rs +++ b/pageserver/src/lib.rs @@ -160,7 +160,7 @@ pub fn is_uninit_mark(path: &Path) -> bool { #[macro_export] macro_rules! fail_point { ($($name:expr),*) => {{ - if cfg!(test) || *crate::TESTING_MODE.get().expect("testing_mode not initialized") { + if cfg!(test) || *$crate::TESTING_MODE.get().expect("testing_mode not initialized") { fail::fail_point!($($name), *) } }};