diff options
| -rw-r--r-- | azalea-brigadier/src/arguments/bool_argument_type.rs | 2 | ||||
| -rw-r--r-- | azalea-brigadier/src/arguments/string_argument_type.rs | 2 | ||||
| -rw-r--r-- | 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<S>, name: &str) -> Option<bool> { +pub fn get_bool<S>(context: &CommandContext<S>, name: &str) -> Option<bool> { 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<S>, name: &str) -> Option<String> { +pub fn get_string<S>(context: &CommandContext<S>, name: &str) -> Option<String> { 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<N: Eq + Hash + Copy, W: PartialOrd + Copy> { pub cost: W, } -#[derive(PartialOrd, PartialEq)] +#[derive(PartialEq)] pub struct Weight<W: PartialOrd + Debug>(W); impl<W: PartialOrd + Debug> Ord for Weight<W> { fn cmp(&self, other: &Self) -> std::cmp::Ordering { @@ -104,3 +104,8 @@ impl<W: PartialOrd + Debug> Ord for Weight<W> { } } impl<W: PartialOrd + Debug> Eq for Weight<W> {} +impl<W: PartialOrd + Debug> PartialOrd for Weight<W> { + fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> { + self.0.partial_cmp(&other.0) + } +} |