From 3b907eada71ea36710566e6fd22a268c42b55e94 Mon Sep 17 00:00:00 2001 From: Ada Alakbarova Date: Sun, 3 Aug 2025 12:09:06 +0200 Subject: use parens for clearer formatting the first and second lines now each represent one approach to getting a `source` --- clippy_utils/src/source.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clippy_utils/src/source.rs b/clippy_utils/src/source.rs index 7d21336be1c..277b074ec58 100644 --- a/clippy_utils/src/source.rs +++ b/clippy_utils/src/source.rs @@ -342,10 +342,7 @@ impl SourceFileRange { /// Attempts to get the text from the source file. This can fail if the source text isn't /// loaded. pub fn as_str(&self) -> Option<&str> { - self.sf - .src - .as_ref() - .map(|src| src.as_str()) + (self.sf.src.as_ref().map(|src| src.as_str())) .or_else(|| self.sf.external_src.get().and_then(|src| src.get_source())) .and_then(|x| x.get(self.range.clone())) } -- cgit 1.4.1-3-g733a5 From 2d8d45e20184628bbf35883164278c0892a7364d Mon Sep 17 00:00:00 2001 From: Ada Alakbarova Date: Sun, 3 Aug 2025 12:12:52 +0200 Subject: use `?` for brevity --- clippy_utils/src/source.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_utils/src/source.rs b/clippy_utils/src/source.rs index 277b074ec58..e675291b6f3 100644 --- a/clippy_utils/src/source.rs +++ b/clippy_utils/src/source.rs @@ -343,7 +343,7 @@ impl SourceFileRange { /// loaded. pub fn as_str(&self) -> Option<&str> { (self.sf.src.as_ref().map(|src| src.as_str())) - .or_else(|| self.sf.external_src.get().and_then(|src| src.get_source())) + .or_else(|| self.sf.external_src.get()?.get_source()) .and_then(|x| x.get(self.range.clone())) } } -- cgit 1.4.1-3-g733a5