From 7248ef77e40dd378e61d5bdfa505eb50786e365c Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Mon, 2 May 2022 09:49:22 -0400
Subject: [PATCH] tamer: diagnose::resolve{r=>}: Rename

Consistent with naming of other modules, which prefers to not needlessly
transform words.

DEV-12151
---
 tamer/src/diagnose.rs                            | 4 ++--
 tamer/src/diagnose/report.rs                     | 6 +++---
 tamer/src/diagnose/report/test.rs                | 2 +-
 tamer/src/diagnose/report/test/integration.rs    | 2 +-
 tamer/src/diagnose/{resolver.rs => resolve.rs}   | 0
 tamer/src/diagnose/{resolver => resolve}/test.rs | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename tamer/src/diagnose/{resolver.rs => resolve.rs} (100%)
 rename tamer/src/diagnose/{resolver => resolve}/test.rs (100%)

diff --git a/tamer/src/diagnose.rs b/tamer/src/diagnose.rs
index 4c078db0..ea98ab58 100644
--- a/tamer/src/diagnose.rs
+++ b/tamer/src/diagnose.rs
@@ -76,10 +76,10 @@
 //! See the [`report`] module for more information.
 
 mod report;
-mod resolver;
+mod resolve;
 
 pub use report::{Reporter, VisualReporter};
-pub use resolver::FsSpanResolver;
+pub use resolve::FsSpanResolver;
 
 use core::fmt;
 use std::{borrow::Cow, error::Error, fmt::Display};
diff --git a/tamer/src/diagnose/report.rs b/tamer/src/diagnose/report.rs
index 183e7918..dac8db2b 100644
--- a/tamer/src/diagnose/report.rs
+++ b/tamer/src/diagnose/report.rs
@@ -19,7 +19,7 @@
 
 //! Rendering of diagnostic report.
 //!
-//! This module is responsible for [resolving](super::resolver) and
+//! This module is responsible for [resolving](super::resolve) and
 //!   rendering spans into a formatted [`Report`],
 //!     which in turn can be rendered into a string with [`Display::fmt`].
 //!
@@ -31,7 +31,7 @@
 //     rather than using both.
 
 use super::{
-    resolver::{
+    resolve::{
         Column, ResolvedSpan, ResolvedSpanData, SourceLine, SpanResolver,
         SpanResolverError,
     },
@@ -777,7 +777,7 @@ impl Display for SectionSourceLine {
 /// Marks are displayed below a [`SectionSourceLine`] and are intended to
 ///   visually display a [`Span`].
 /// Column resolution
-///   (see [`super::resolver`])
+///   (see [`super::resolve`])
 ///   exists primarily for mark rendering.
 #[derive(Debug, PartialEq, Eq)]
 struct LineMark<'d> {
diff --git a/tamer/src/diagnose/report/test.rs b/tamer/src/diagnose/report/test.rs
index e34f16fe..9634c66e 100644
--- a/tamer/src/diagnose/report/test.rs
+++ b/tamer/src/diagnose/report/test.rs
@@ -20,7 +20,7 @@
 use super::*;
 use crate::{
     convert::ExpectInto,
-    diagnose::resolver::Column,
+    diagnose::resolve::Column,
     span::{DUMMY_CONTEXT, DUMMY_SPAN},
 };
 use std::{io, num::NonZeroU32};
diff --git a/tamer/src/diagnose/report/test/integration.rs b/tamer/src/diagnose/report/test/integration.rs
index 60339aac..1b1029c8 100644
--- a/tamer/src/diagnose/report/test/integration.rs
+++ b/tamer/src/diagnose/report/test/integration.rs
@@ -54,7 +54,7 @@
 
 use crate::span::Context;
 
-use super::super::super::{resolver::BufSpanResolver, Annotate};
+use super::super::super::{resolve::BufSpanResolver, Annotate};
 use super::*;
 use std::{
     collections::HashMap,
diff --git a/tamer/src/diagnose/resolver.rs b/tamer/src/diagnose/resolve.rs
similarity index 100%
rename from tamer/src/diagnose/resolver.rs
rename to tamer/src/diagnose/resolve.rs
diff --git a/tamer/src/diagnose/resolver/test.rs b/tamer/src/diagnose/resolve/test.rs
similarity index 100%
rename from tamer/src/diagnose/resolver/test.rs
rename to tamer/src/diagnose/resolve/test.rs