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 cf7f556023a596cc54a58da8b47493cc3b2fccdc..e2c56d8da29cd52ea9cf6bf8d16ff476ba939672 100644 (file)
--- 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 50123225cfab071990f4db0828f860646a10f9a8..ef9209ffd6136efaf97690e40ac5b1fb5848c46d 100644 (file)
--- 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 fe74757133553dba93504aa0deb10f58174ea9be..3a572af3b6d6c1804f634bd4e9ce317f4b6df6cb 100644 (file)
--- 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;