From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 May 2021 20:57:44 +0000 (+0100)
Subject: ItemEnquiryData: format it with Display, not an ad-hoc method
X-Git-Tag: otter-0.6.0~252
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=080fccba4ac6012b3b0a835b1a3655fb2fe63f87;p=otter.git

ItemEnquiryData: format it with Display, not an ad-hoc method

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index ab853d15..3c828a87 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -1037,7 +1037,7 @@ mod library_list {
 
     let items = chan.list_items(&args.pat)?;
     for it in &items {
-      println!("{}", it.line_for_list());
+      println!("{}", it);
     }
 
     Ok(())
diff --git a/src/bin/otterlib.rs b/src/bin/otterlib.rs
index a2b026c9..c790fedd 100644
--- a/src/bin/otterlib.rs
+++ b/src/bin/otterlib.rs
@@ -248,7 +248,7 @@ fn main() {
 
   match opts.outkind {
     OutputKind::List => for item in &items {
-      println!("{:<10} {}", &item.0, item.1.line_for_list());
+      println!("{:<10} {}", &item.0, &item.1);
     }
     OutputKind::Preview => {
       preview(items)?
diff --git a/src/shapelib.rs b/src/shapelib.rs
index d85a61d2..28c362fc 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -227,9 +227,10 @@ pub struct ItemEnquiryData {
   pub f0bbox: Rect,
 }
 
-impl ItemEnquiryData {
-  pub fn line_for_list(&self) -> String {
-    format!("{:20}  {}", self.itemname, self.f0desc.as_html_str())
+impl Display for ItemEnquiryData {
+  #[throws(fmt::Error)]
+  fn fmt(&self, f: &mut Formatter) {
+    write!(f, "{:20}  {}", self.itemname, self.f0desc.as_html_str())?;
   }
 }