chore: Update lints from epage/_rust template

Author: epage

Cargo.toml

@@ -50,4 +50,68 @@ default = []
 testing-colors = []
 
 [lints.rust]
-rust_2018_idioms = "warn"
+rust_2018_idioms = { level = "warn", priority = -1 }
+unreachable_pub = "warn"
+unsafe_op_in_unsafe_fn = "warn"
+unused_lifetimes = "warn"
+unused_macro_rules = "warn"
+unused_qualifications = "warn"
+
+[lints.clippy]
+bool_assert_comparison = "allow"
+branches_sharing_code = "allow"
+checked_conversions = "warn"
+collapsible_else_if = "allow"
+create_dir = "warn"
+dbg_macro = "warn"
+debug_assert_with_mut_call = "warn"
+doc_markdown = "warn"
+empty_enum = "warn"
+enum_glob_use = "warn"
+expl_impl_clone_on_copy = "warn"
+explicit_deref_methods = "warn"
+explicit_into_iter_loop = "warn"
+fallible_impl_from = "warn"
+filter_map_next = "warn"
+flat_map_option = "warn"
+float_cmp_const = "warn"
+fn_params_excessive_bools = "warn"
+from_iter_instead_of_collect = "warn"
+if_same_then_else = "allow"
+implicit_clone = "warn"
+imprecise_flops = "warn"
+inconsistent_struct_constructor = "warn"
+inefficient_to_string = "warn"
+infinite_loop = "warn"
+invalid_upcast_comparisons = "warn"
+large_digit_groups = "warn"
+large_stack_arrays = "warn"
+large_types_passed_by_value = "warn"
+let_and_return = "allow"  # sometimes good to name what you are returning
+linkedlist = "warn"
+lossy_float_literal = "warn"
+macro_use_imports = "warn"
+mem_forget = "warn"
+mutex_integer = "warn"
+needless_continue = "warn"
+needless_for_each = "warn"
+negative_feature_names = "warn"
+path_buf_push_overwrite = "warn"
+ptr_as_ptr = "warn"
+rc_mutex = "warn"
+redundant_feature_names = "warn"
+ref_option_ref = "warn"
+rest_pat_in_fully_bound_structs = "warn"
+same_functions_in_if_condition = "warn"
+self_named_module_files = "warn"
+semicolon_if_nothing_returned = "warn"
+str_to_string = "warn"
+string_add = "warn"
+string_add_assign = "warn"
+string_lit_as_bytes = "warn"
+string_to_string = "warn"
+todo = "warn"
+trait_duplication_in_bounds = "warn"
+verbose_file_reads = "warn"
+wildcard_imports = "warn"
+zero_sized_map_values = "warn"

benches/simple.rs

@@ -50,7 +50,7 @@ fn create_snippet(renderer: Renderer) {
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("format", |b| {
-        b.iter(|| black_box(create_snippet(Renderer::plain())))
+        b.iter(|| black_box(create_snippet(Renderer::plain())));
     });
 }
 

src/renderer/display_list.rs

@@ -1,4 +1,4 @@
-//! display_list module stores the output model for the snippet.
+//! `display_list` module stores the output model for the snippet.
 //!
 //! `DisplayList` is a central structure in the crate, which contains
 //! the structured list of lines to be displayed.
@@ -48,9 +48,9 @@ const WARNING_TXT: &str = "warning";
 
 /// List of lines to be displayed.
 pub(crate) struct DisplayList<'a> {
-    pub body: Vec<DisplaySet<'a>>,
-    pub stylesheet: &'a Stylesheet,
-    pub anonymized_line_numbers: bool,
+    pub(crate) body: Vec<DisplaySet<'a>>,
+    pub(crate) stylesheet: &'a Stylesheet,
+    pub(crate) anonymized_line_numbers: bool,
 }
 
 impl<'a> PartialEq for DisplayList<'a> {
@@ -147,8 +147,8 @@ impl<'a> DisplayList<'a> {
 
 #[derive(Debug, PartialEq)]
 pub(crate) struct DisplaySet<'a> {
-    pub display_lines: Vec<DisplayLine<'a>>,
-    pub margin: Margin,
+    pub(crate) display_lines: Vec<DisplayLine<'a>>,
+    pub(crate) margin: Margin,
 }
 
 impl<'a> DisplaySet<'a> {
@@ -493,15 +493,15 @@ impl<'a> DisplaySet<'a> {
 
 /// Inline annotation which can be used in either Raw or Source line.
 #[derive(Debug, PartialEq)]
-pub struct Annotation<'a> {
-    pub annotation_type: DisplayAnnotationType,
-    pub id: Option<&'a str>,
-    pub label: Vec<DisplayTextFragment<'a>>,
+pub(crate) struct Annotation<'a> {
+    pub(crate) annotation_type: DisplayAnnotationType,
+    pub(crate) id: Option<&'a str>,
+    pub(crate) label: Vec<DisplayTextFragment<'a>>,
 }
 
 /// A single line used in `DisplayList`.
 #[derive(Debug, PartialEq)]
-pub enum DisplayLine<'a> {
+pub(crate) enum DisplayLine<'a> {
     /// A line with `lineno` portion of the slice.
     Source {
         lineno: Option<usize>,
@@ -519,7 +519,7 @@ pub enum DisplayLine<'a> {
 
 /// A source line.
 #[derive(Debug, PartialEq)]
-pub enum DisplaySourceLine<'a> {
+pub(crate) enum DisplaySourceLine<'a> {
     /// A line with the content of the Snippet.
     Content {
         text: &'a str,
@@ -530,17 +530,17 @@ pub enum DisplaySourceLine<'a> {
 }
 
 #[derive(Debug, PartialEq)]
-pub struct DisplaySourceAnnotation<'a> {
-    pub annotation: Annotation<'a>,
-    pub range: (usize, usize),
-    pub annotation_type: DisplayAnnotationType,
-    pub annotation_part: DisplayAnnotationPart,
+pub(crate) struct DisplaySourceAnnotation<'a> {
+    pub(crate) annotation: Annotation<'a>,
+    pub(crate) range: (usize, usize),
+    pub(crate) annotation_type: DisplayAnnotationType,
+    pub(crate) annotation_part: DisplayAnnotationPart,
 }
 
 /// Raw line - a line which does not have the `lineno` part and is not considered
 /// a part of the snippet.
 #[derive(Debug, PartialEq)]
-pub enum DisplayRawLine<'a> {
+pub(crate) enum DisplayRawLine<'a> {
     /// A line which provides information about the location of the given
     /// slice in the project structure.
     Origin {
@@ -566,23 +566,23 @@ pub enum DisplayRawLine<'a> {
 
 /// An inline text fragment which any label is composed of.
 #[derive(Debug, PartialEq)]
-pub struct DisplayTextFragment<'a> {
-    pub content: &'a str,
-    pub style: DisplayTextStyle,
+pub(crate) struct DisplayTextFragment<'a> {
+    pub(crate) content: &'a str,
+    pub(crate) style: DisplayTextStyle,
 }
 
 /// A style for the `DisplayTextFragment` which can be visually formatted.
 ///
 /// This information may be used to emphasis parts of the label.
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub enum DisplayTextStyle {
+pub(crate) enum DisplayTextStyle {
     Regular,
     Emphasis,
 }
 
 /// An indicator of what part of the annotation a given `Annotation` is.
 #[derive(Debug, Clone, PartialEq)]
-pub enum DisplayAnnotationPart {
+pub(crate) enum DisplayAnnotationPart {
     /// A standalone, single-line annotation.
     Standalone,
     /// A continuation of a multi-line label of an annotation.
@@ -595,14 +595,14 @@ pub enum DisplayAnnotationPart {
 
 /// A visual mark used in `inline_marks` field of the `DisplaySourceLine`.
 #[derive(Debug, Clone, PartialEq)]
-pub struct DisplayMark {
-    pub mark_type: DisplayMarkType,
-    pub annotation_type: DisplayAnnotationType,
+pub(crate) struct DisplayMark {
+    pub(crate) mark_type: DisplayMarkType,
+    pub(crate) annotation_type: DisplayAnnotationType,
 }
 
 /// A type of the `DisplayMark`.
 #[derive(Debug, Clone, PartialEq)]
-pub enum DisplayMarkType {
+pub(crate) enum DisplayMarkType {
     /// A mark indicating a multiline annotation going through the current line.
     AnnotationThrough,
     /// A mark indicating a multiline annotation starting on the given line.
@@ -617,7 +617,7 @@ pub enum DisplayMarkType {
 /// * An underline for `Error` may be `^^^` while for `Warning` it could be `---`.
 /// * `ColorStylesheet` may use different colors for different annotations.
 #[derive(Debug, Clone, PartialEq)]
-pub enum DisplayAnnotationType {
+pub(crate) enum DisplayAnnotationType {
     None,
     Error,
     Warning,
@@ -642,7 +642,7 @@ impl From<snippet::Level> for DisplayAnnotationType {
 /// for multi-slice cases.
 // TODO: private
 #[derive(Debug, Clone, PartialEq)]
-pub enum DisplayHeaderType {
+pub(crate) enum DisplayHeaderType {
     /// Initial header is the first header in the snippet.
     Initial,
 
@@ -728,9 +728,9 @@ fn format_message(
     }
 
     if let Some(first) = sets.first_mut() {
-        body.into_iter().for_each(|line| {
+        for line in body {
             first.display_lines.insert(0, line);
-        });
+        }
     } else {
         sets.push(DisplaySet {
             display_lines: body,
@@ -1335,7 +1335,7 @@ const OUTPUT_REPLACEMENTS: &[(char, &str)] = &[
 ];
 
 fn normalize_whitespace(str: &str) -> String {
-    let mut s = str.to_string();
+    let mut s = str.to_owned();
     for (c, replacement) in OUTPUT_REPLACEMENTS {
         s = s.replace(*c, replacement);
     }

src/renderer/margin.rs

@@ -5,7 +5,7 @@ const LONG_WHITESPACE: usize = 20;
 const LONG_WHITESPACE_PADDING: usize = 4;
 
 #[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Margin {
+pub(crate) struct Margin {
     /// The available whitespace in the left that can be consumed when centering.
     whitespace_left: usize,
     /// The column of the beginning of left-most span.
@@ -24,7 +24,7 @@ pub struct Margin {
 }
 
 impl Margin {
-    pub fn new(
+    pub(crate) fn new(
         whitespace_left: usize,
         span_left: usize,
         span_right: usize,

tests/fixtures/deserialize.rs

@@ -5,11 +5,11 @@ use annotate_snippets::renderer::DEFAULT_TERM_WIDTH;
 use annotate_snippets::{Annotation, Level, Message, Renderer, Snippet};
 
 #[derive(Deserialize)]
-pub struct Fixture<'a> {
+pub(crate) struct Fixture<'a> {
     #[serde(default)]
-    pub renderer: RendererDef,
+    pub(crate) renderer: RendererDef,
     #[serde(borrow)]
-    pub message: MessageDef<'a>,
+    pub(crate) message: MessageDef<'a>,
 }
 
 #[derive(Deserialize)]
@@ -88,7 +88,7 @@ impl<'a> From<SnippetDef<'a>> for Snippet<'a> {
         } = val;
         let mut snippet = Snippet::source(source).line_start(line_start).fold(fold);
         if let Some(origin) = origin {
-            snippet = snippet.origin(origin)
+            snippet = snippet.origin(origin);
         }
         snippet = snippet.annotations(annotations);
         snippet
@@ -127,11 +127,11 @@ impl<'a> From<AnnotationDef<'a>> for Annotation<'a> {
 }
 
 #[derive(Serialize, Deserialize)]
-pub struct LabelDef<'a> {
+pub(crate) struct LabelDef<'a> {
     #[serde(with = "LevelDef")]
-    pub level: Level,
+    pub(crate) level: Level,
     #[serde(borrow)]
-    pub label: &'a str,
+    pub(crate) label: &'a str,
 }
 
 #[allow(dead_code)]

tests/fixtures/main.rs

@@ -15,7 +15,7 @@ fn main() {
 
 fn setup(input_path: std::path::PathBuf) -> tryfn::Case {
     let name = input_path.file_name().unwrap().to_str().unwrap().to_owned();
-    let expected = tryfn::Data::read_from(&input_path.with_extension("svg"), None);
+    let expected = Data::read_from(&input_path.with_extension("svg"), None);
     tryfn::Case {
         name,
         fixture: input_path,