fix clippy issues and improve formatting everywhere

2 files changed, 8 insertions, 6 deletions

diff --git a/azalea-brigadier/src/suggestion/mod.rs b/azalea-brigadier/src/suggestion/mod.rs
index a1c385cc..af29264e 100644
--- a/azalea-brigadier/src/suggestion/mod.rs
+++ b/azalea-brigadier/src/suggestion/mod.rs
@@ -5,8 +5,10 @@ mod suggestions_builder;
 #[cfg(feature = "azalea-buf")]
 use std::io::Write;
 use std::{
+    cmp::Ordering,
     fmt::{self, Display},
     hash::Hash,
+    io,
 };
 
 #[cfg(feature = "azalea-buf")]
@@ -95,7 +97,7 @@ impl Suggestion {
 }
 
 impl SuggestionValue {
-    pub fn cmp_ignore_case(&self, other: &Self) -> std::cmp::Ordering {
+    pub fn cmp_ignore_case(&self, other: &Self) -> Ordering {
         match (self, other) {
             (SuggestionValue::Text(a), SuggestionValue::Text(b)) => {
                 a.to_lowercase().cmp(&b.to_lowercase())
@@ -120,7 +122,7 @@ impl Display for SuggestionValue {
 }
 
 impl Ord for SuggestionValue {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+    fn cmp(&self, other: &Self) -> Ordering {
         match (self, other) {
             (SuggestionValue::Text(a), SuggestionValue::Text(b)) => a.cmp(b),
             (SuggestionValue::Integer(a), SuggestionValue::Integer(b)) => a.cmp(b),
@@ -133,14 +135,14 @@ impl Ord for SuggestionValue {
     }
 }
 impl PartialOrd for SuggestionValue {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         Some(self.cmp(other))
     }
 }
 
 #[cfg(feature = "azalea-buf")]
 impl AzaleaWrite for Suggestion {
-    fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
+    fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> {
         self.value.to_string().azalea_write(buf)?;
         self.tooltip
             .clone()
diff --git a/azalea-brigadier/src/suggestion/suggestions.rs b/azalea-brigadier/src/suggestion/suggestions.rs
index 60eaa111..7f04d9d7 100644
--- a/azalea-brigadier/src/suggestion/suggestions.rs
+++ b/azalea-brigadier/src/suggestion/suggestions.rs
@@ -1,6 +1,6 @@
 #[cfg(feature = "azalea-buf")]
 use std::io::{Cursor, Write};
-use std::{collections::HashSet, hash::Hash};
+use std::{collections::HashSet, hash::Hash, io};
 
 #[cfg(feature = "azalea-buf")]
 use azalea_buf::{AzBuf, AzaleaRead, AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError};
@@ -107,7 +107,7 @@ impl AzaleaRead for Suggestions {
 
 #[cfg(feature = "azalea-buf")]
 impl AzaleaWrite for Suggestions {
-    fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
+    fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> {
         (self.range.start() as u32).azalea_write_var(buf)?;
         (self.range.length() as u32).azalea_write_var(buf)?;
         self.suggestions.azalea_write(buf)?;