From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 May 2021 11:00:40 +0000 (+0100)
Subject: sshkeys: Make module sub-module of accounts
X-Git-Tag: otter-0.7.0~224
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=57c9a6999d23ee1abe2439d0889421526f924ce1;p=otter.git

sshkeys: Make module sub-module of accounts

This will let it deal with the data structures directly.

This is good because it avoids lifetime problems with borrowing the
whole of Accounts and it is OK because sshkeys takes care over save
orderig, etc.

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

diff --git a/src/accounts.rs b/src/accounts.rs
index cf7f5560..e2c56d8d 100644
--- a/src/accounts.rs
+++ b/src/accounts.rs
@@ -8,6 +8,9 @@ use parking_lot::{Mutex, const_mutex, MutexGuard};
 
 use authproofs::*;
 
+#[path="sshkeys.rs"]
+pub mod sshkeys;
+
 //---------- simple types ----------
 
 slotmap::new_key_type!{
diff --git a/src/lib.rs b/src/lib.rs
index 50123225..ef9209ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -35,7 +35,6 @@ pub mod pieces;
 pub mod progress;
 pub mod shapelib;
 pub mod spec;
-pub mod sshkeys;
 pub mod sse;
 pub mod termprogress;
 pub mod timedfd;
diff --git a/src/prelude.rs b/src/prelude.rs
index fe747571..3a572af3 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -162,7 +162,6 @@ pub use crate::slotmap_slot_idx::*;
 pub use crate::spec::*;
 pub use crate::spec::piece_specs::{FaceColourSpecs, SimpleCommon};
 pub use crate::sse;
-pub use crate::sshkeys;
 pub use crate::toml_de;
 pub use crate::timedfd::*;
 pub use crate::termprogress;