From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Jul 2020 01:25:03 +0000 (+0100)
Subject: reorg nfc
X-Git-Tag: otter-0.2.0~1250
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=453b981917063fc6e343517d02376dbe7325a5ea;p=otter.git

reorg nfc
---

diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index a925e489..2f6c51d5 100644
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -104,9 +104,6 @@ impl CommandStream<'_> {
 fn authorise_scope(cs: &CommandStream, wanted: &ManagementScope)
                    -> AuthorisedSatisfactory {
   type AS<T> = (T, ManagementScope);
-//  fn AS<T>(a:T, s:ManagementScope) -> AuthorisedScope<T>
-//  { AuthorisedScope(a,s) }
-  use fs::File;
 
   match &wanted {
     ManagementScope::XXX => {
diff --git a/src/imports.rs b/src/imports.rs
index 8476e920..5507ff23 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -22,6 +22,7 @@ pub use std::error::Error;
 pub use std::marker::PhantomData;
 pub use std::ops::{Deref,DerefMut};
 pub use std::fs;
+pub use std::fs::File;
 pub use std::mem;
   
 pub use thiserror::Error;