From d2e577bbc19ceb1815b8fb97f1465e1dbe793465 Mon Sep 17 00:00:00 2001 From: Xinkai Chen Date: Sun, 22 Mar 2026 04:56:35 +0800 Subject: [PATCH] choir: simplify code --- src/env.rs | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/env.rs b/src/env.rs index d66372a..d918705 100644 --- a/src/env.rs +++ b/src/env.rs @@ -1,30 +1,13 @@ -use crate::args::KeyOrder; -use crate::platform_ext; -use serde::ser::SerializeMap; -use serde::{Serialize, Serializer}; -use std::cmp::Ordering; use std::slice::Iter; -#[derive(Eq, Debug)] -pub struct RecordPair(pub Vec, pub Vec); - -impl PartialEq for RecordPair { - fn eq(&self, other: &Self) -> bool { - self.0.eq(&other.0) - } -} +use serde::ser::SerializeMap; +use serde::{Serialize, Serializer}; -impl PartialOrd for RecordPair { - fn partial_cmp(&self, other: &Self) -> Option { - Some(self.cmp(other)) - } -} +use crate::args::KeyOrder; +use crate::platform_ext; -impl Ord for RecordPair { - fn cmp(&self, other: &Self) -> Ordering { - self.0.cmp(&other.0) - } -} +#[derive(Eq, Debug, PartialEq, PartialOrd, Ord)] +pub struct RecordPair(pub Vec, pub Vec); #[derive(Debug, PartialEq, Eq)] pub struct Env(pub Vec);