From 80172e43640d2ec3c761611d2269d12a9abdd424 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 12 May 2023 18:53:08 +0000 Subject: fix warnings --- azalea-brigadier/src/arguments/bool_argument_type.rs | 2 +- azalea-brigadier/src/arguments/string_argument_type.rs | 2 +- azalea/src/pathfinder/astar.rs | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/azalea-brigadier/src/arguments/bool_argument_type.rs b/azalea-brigadier/src/arguments/bool_argument_type.rs index 01828c87..57fa8a03 100644 --- a/azalea-brigadier/src/arguments/bool_argument_type.rs +++ b/azalea-brigadier/src/arguments/bool_argument_type.rs @@ -12,7 +12,7 @@ impl ArgumentType for bool { } } -pub fn get_bool<'a, S>(context: &'a CommandContext, name: &str) -> Option { +pub fn get_bool(context: &CommandContext, name: &str) -> Option { context .argument(name) .unwrap() diff --git a/azalea-brigadier/src/arguments/string_argument_type.rs b/azalea-brigadier/src/arguments/string_argument_type.rs index f23af3ba..27363bd4 100644 --- a/azalea-brigadier/src/arguments/string_argument_type.rs +++ b/azalea-brigadier/src/arguments/string_argument_type.rs @@ -44,7 +44,7 @@ pub fn string() -> impl ArgumentType { pub fn greedy_string() -> impl ArgumentType { StringArgument::GreedyPhrase } -pub fn get_string<'a, S>(context: &'a CommandContext, name: &str) -> Option { +pub fn get_string(context: &CommandContext, name: &str) -> Option { context .argument(name) .unwrap() diff --git a/azalea/src/pathfinder/astar.rs b/azalea/src/pathfinder/astar.rs index 858e7720..65caf337 100644 --- a/azalea/src/pathfinder/astar.rs +++ b/azalea/src/pathfinder/astar.rs @@ -94,7 +94,7 @@ pub struct Edge { pub cost: W, } -#[derive(PartialOrd, PartialEq)] +#[derive(PartialEq)] pub struct Weight(W); impl Ord for Weight { fn cmp(&self, other: &Self) -> std::cmp::Ordering { @@ -104,3 +104,8 @@ impl Ord for Weight { } } impl Eq for Weight {} +impl PartialOrd for Weight { + fn partial_cmp(&self, other: &Self) -> Option { + self.0.partial_cmp(&other.0) + } +} -- cgit v1.2.3