From 87e4a3da43e7d203d3405f977ce8e93298dd55c3 Mon Sep 17 00:00:00 2001
From: Rory Dudley
Date: Thu, 11 Apr 2024 21:49:51 -0600
Subject: Sort output of 'export' and 'alias'

Sort the output of the built-in 'export' and 'alias' commands, in cases
where all environment variables/aliases are printed out.
---
 src/poem/anthology/alias.rs  | 4 +++-
 src/poem/anthology/export.rs | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/poem/anthology')

diff --git a/src/poem/anthology/alias.rs b/src/poem/anthology/alias.rs
index 248342e..511bd3a 100644
--- a/src/poem/anthology/alias.rs
+++ b/src/poem/anthology/alias.rs
@@ -1,4 +1,5 @@
 use crate::poem::Verse;
+use std::collections::BTreeMap;
 use std::collections::HashMap;
 
 /// alias
@@ -23,7 +24,8 @@ pub fn incant(verse: &Verse, out: &mut Vec<u8>, aliases: &mut HashMap<String, St
         }
         None => {
             let mut lines = Vec::new();
-            for (key, val) in aliases {
+            let sorted: BTreeMap<_, _> = aliases.into_iter().collect();
+            for (key, val) in sorted {
                 let line = if key.contains(' ') && val.contains(' ') {
                     format!("'{}'='{}'", key, val)
                 } else if key.contains(' ') {
diff --git a/src/poem/anthology/export.rs b/src/poem/anthology/export.rs
index dfbaf81..aa5a894 100644
--- a/src/poem/anthology/export.rs
+++ b/src/poem/anthology/export.rs
@@ -1,4 +1,5 @@
 use crate::poem::Verse;
+use std::collections::BTreeMap;
 use std::env;
 
 /// export
@@ -26,7 +27,8 @@ pub fn incant(verse: &Verse) -> i32 {
             }
         }
         None => {
-            for (key, val) in env::vars() {
+            let sorted: BTreeMap<_, _> = env::vars().into_iter().collect();
+            for (key, val) in sorted {
                 println!("{}={}", key, val);
             }
         }
-- 
cgit v1.2.3