about summary refs log tree commit diff
diff options
context:
space:
mode:
authorllogiq <bogusandre@gmail.com>2025-08-03 16:56:11 +0000
committerGitHub <noreply@github.com>2025-08-03 16:56:11 +0000
commit151a045fdd4abaee425c2cd4065d83b2c8f222bb (patch)
treebe3bb3ec60f5a2dba47df8b1bfdf52d79ccd0265
parent88bcf1ca19236b2b51d55080d817e49ef2d8fd17 (diff)
parent2d8d45e20184628bbf35883164278c0892a7364d (diff)
downloadrust-151a045fdd4abaee425c2cd4065d83b2c8f222bb.tar.gz
rust-151a045fdd4abaee425c2cd4065d83b2c8f222bb.zip
clean-up `SourceFileRange::as_str` (#15401)
changelog: none
-rw-r--r--clippy_utils/src/source.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/clippy_utils/src/source.rs b/clippy_utils/src/source.rs
index 7d21336be1c..e675291b6f3 100644
--- a/clippy_utils/src/source.rs
+++ b/clippy_utils/src/source.rs
@@ -342,11 +342,8 @@ 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())
-            .or_else(|| self.sf.external_src.get().and_then(|src| src.get_source()))
+        (self.sf.src.as_ref().map(|src| src.as_str()))
+            .or_else(|| self.sf.external_src.get()?.get_source())
             .and_then(|x| x.get(self.range.clone()))
     }
 }