refactor: pull keymap, layer, menu into a top-level module

src/editor/mod.rs

@@ -2,9 +2,6 @@
 
 mod app;
 mod interpreter;
-mod keymap;
-mod layer;
-mod menu;
 mod runtime;
 mod stack;
 
@@ -13,6 +10,8 @@ use crate::frontends::Frontend;
 use std::error::Error;
 use std::fmt;
 
+pub use stack::{Op, Prog, Value};
+
 // TODO: Is this InterpreterError, AppError, a mix of both?
 #[derive(thiserror::Error, fmt::Debug)]
 pub enum EditorError {

src/editor/runtime.rs

@@ -1,8 +1,8 @@
-use super::layer::LayerManager;
 use super::stack::Prog;
 use super::EditorError;
 use crate::engine::{DocDisplayLabel, Engine};
 use crate::frontends::{Event, Frontend, Key};
+use crate::keymap::LayerManager;
 use crate::style::Style;
 use crate::tree::Mode;
 use crate::util::SynlessBug;

src/editor/keymap.rs → src/keymap/keymap.rs

@@ -1,4 +1,6 @@
-use super::stack::{Op, Prog, Value};
+#![allow(clippy::module_inception)]
+
+use crate::editor::{Op, Prog, Value};
 use crate::frontends::Key;
 use crate::language::Storage;
 use crate::tree::Node;

src/editor/layer.rs → src/keymap/layer.rs

@@ -1,6 +1,6 @@
 use super::keymap::Keymap;
 use super::menu::{Menu, MenuName, MenuSelectionCmd};
-use super::stack::Prog;
+use crate::editor::Prog;
 use crate::engine::DocName;
 use crate::frontends::Key;
 use crate::language::Storage;

src/editor/menu.rs → src/keymap/menu.rs

@@ -1,5 +1,5 @@
 use super::keymap::{Candidate, Keymap};
-use super::stack::Prog;
+use crate::editor::Prog;
 use crate::frontends::Key;
 use crate::language::Storage;
 use crate::tree::Node;

src/keymap/mod.rs

@@ -0,0 +1,5 @@
+mod keymap;
+mod layer;
+mod menu;
+
+pub use layer::LayerManager;

src/lib.rs

@@ -4,6 +4,7 @@
 mod editor;
 mod engine;
 mod frontends;
+mod keymap;
 mod language;
 mod pretty_doc;
 mod style;