From 74729ec02fba41cf0d3126c55c9e369feef38aff Mon Sep 17 00:00:00 2001
From: Лач <iam@lach.pw>
Date: Thu, 02 Jul 2020 20:15:02 +0000
Subject: [PATCH] refactor: move field sorting to visible_fields


---
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -86,11 +86,14 @@
 		Rc::try_unwrap(out).unwrap().into_inner()
 	}
 	pub fn visible_fields(&self) -> Vec<Rc<str>> {
-		self.fields_visibility()
+		let mut visible_fields: Vec<_> = self
+			.fields_visibility()
 			.into_iter()
 			.filter(|(_k, v)| *v)
 			.map(|(k, _)| k)
-			.collect()
+			.collect();
+		visible_fields.sort();
+		visible_fields
 	}
 	pub fn get(&self, key: Rc<str>) -> Result<Option<Val>> {
 		if let Some(v) = self.0.value_cache.borrow().get(&key) {
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -255,8 +255,7 @@
 		}
 		Val::Obj(obj) => {
 			buf.push_str("{\n");
-			let mut fields = obj.visible_fields();
-			fields.sort();
+			let fields = obj.visible_fields();
 			if !fields.is_empty() {
 				let old_len = cur_padding.len();
 				cur_padding.push_str(padding);

-- 
gitstuff