From db25b9e8845966a4be077535129f9b02a58a0f1c Mon Sep 17 00:00:00 2001 From: David Binder Date: Sun, 12 May 2024 20:20:17 +0200 Subject: [PATCH] Fix clippy hints --- src/file.rs | 4 ++-- src/index.rs | 5 +++++ src/span.rs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/file.rs b/src/file.rs index e3430c9a..3a41650f 100644 --- a/src/file.rs +++ b/src/file.rs @@ -196,7 +196,7 @@ where /// let mut files = Files::new(); /// let file_id = files.add("test", source); /// - /// assert_eq!(files.source_span(file_id), Span::from_str(source)); + /// assert_eq!(files.source_span(file_id), Span::from_string(source)); /// ``` pub fn source_span(&self, file_id: FileId) -> Span { self.get(file_id).source_span() @@ -355,7 +355,7 @@ where } pub fn source_span(&self) -> Span { - Span::from_str(self.source.as_ref()) + Span::from_string(self.source.as_ref()) } pub fn source_slice(&self, span: Span) -> Result<&str, Error> { diff --git a/src/index.rs b/src/index.rs index 6c6c3b21..473c33d4 100644 --- a/src/index.rs +++ b/src/index.rs @@ -33,6 +33,7 @@ impl LineIndex { } } +#[allow(clippy::derivable_impls)] impl Default for LineIndex { fn default() -> LineIndex { LineIndex(0) @@ -82,6 +83,7 @@ impl fmt::Display for LineNumber { #[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] pub struct LineOffset(pub RawOffset); +#[allow(clippy::derivable_impls)] impl Default for LineOffset { fn default() -> LineOffset { LineOffset(0) @@ -125,6 +127,7 @@ impl ColumnIndex { } } +#[allow(clippy::derivable_impls)] impl Default for ColumnIndex { fn default() -> ColumnIndex { ColumnIndex(0) @@ -167,6 +170,7 @@ impl fmt::Display for ColumnNumber { #[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)] pub struct ColumnOffset(pub RawOffset); +#[allow(clippy::derivable_impls)] impl Default for ColumnOffset { fn default() -> ColumnOffset { ColumnOffset(0) @@ -198,6 +202,7 @@ impl ByteIndex { } } +#[allow(clippy::derivable_impls)] impl Default for ByteIndex { fn default() -> ByteIndex { ByteIndex(0) diff --git a/src/span.rs b/src/span.rs index e323687c..56f1446e 100644 --- a/src/span.rs +++ b/src/span.rs @@ -33,11 +33,11 @@ impl Span { /// ```rust /// use codespan::{ByteIndex, Span}; /// - /// let span = Span::from_str("hello"); + /// let span = Span::from_string("hello"); /// /// assert_eq!(span, Span::new(0, 5)); /// ``` - pub fn from_str(s: &str) -> Span { + pub fn from_string(s: &str) -> Span { Span::new(0, s.len() as u32) }