From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 14 Aug 2020 00:06:34 +0000 (+0100)
Subject: repro syn span thing before update
X-Git-Tag: otter-0.2.0~1127
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ff9cd851efb453ffa85e150a3dbf634dafd88c01;p=otter.git

repro syn span thing before update
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 91adcc10..6bb42731 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -194,10 +194,8 @@ inventory::submit!{Subcommand(
   do_create_table,
 )}
 
-//#[throws(E)]
-fn do_create_table(_sc: &Subcommand, ma: MainOpts, args: Vec<String>) 
- -> Result<(),E>
-{
+#[throws(E)]
+fn do_create_table(_sc: &Subcommand, ma: MainOpts, args: Vec<String>) {
   #[derive(Default,Debug)]
   struct Args {
     name: String,
@@ -216,16 +214,13 @@ fn do_create_table(_sc: &Subcommand, ma: MainOpts, args: Vec<String>)
     Ok(())
   }, None);
 
-let specf = &args.file;
-  let spec = {//(|f|{
-
-    let mut f = File::open(specf).context("open")?;
+  let spec = (||{
+    let mut f = File::open(&args.file).context("open")?;
     let mut buf = String::new();
     f.read_to_string(&mut buf).context("read")?;
     let spec : TableSpec = toml::de::from_str(&buf).context("parse")?;
     <Result<_,AE>>::Ok(spec)
-//  })(&args.file).context("game spec toml").context(&args.file)?;
-  };
+  })().context("game spec toml").context(&args.file)?;
 
   let chan = connect(&ma)?;