Call Rust modules "mod" whenever possible, to avoid confusion

Author: ubolonton

CHANGELOG.md

@@ -62,7 +62,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [0.9.0] - 2019-07-11
 - `ResultExt` is now a collection of Emacs-specific extension methods for `Result`, instead of a re-export of `failure::ResultExt`.
-- Added `failure` as a re-exported sub-module.
+- Added `failure` as a re-exported sub-mod.
 - Added `unwrap_or_propagate` for better panic handling: propagation of non-local exits without `Result`, and improved error messages.
 
 ## [0.8.0] - 2019-04-20

emacs-macros/src/lib.rs

@@ -90,7 +90,7 @@ pub fn module(attr_ts: TokenStream, item_ts: TokenStream) -> TokenStream {
 /// - `crate-prefix` is the feature name followed by `-`. This can be customized by the `name`,
 /// `defun_prefix`, and `separator` options on #[[`module`]].
 ///
-/// - `mod-prefix` is constructed from the function's Rust module path (with `_` and `::` replaced
+/// - `mod-prefix` is constructed from the function's Rust `mod` path (with `_` and `::` replaced
 /// by `-`). This can be turned off crate-wide, or for individual function, using the option
 /// `mod_in_name`.
 ///

guide/src/functions.md

@@ -1,6 +1,6 @@
 # Writing Functions
 
-You can use the attribute macro `#[defun]` to export Rust functions to the Lisp runtime, so that Lisp code can call them. The exporting process happens when the module is loaded, even if the definitions are inside another function that is never called, or inside a private module.
+You can use the attribute macro `#[defun]` to export Rust functions to the Lisp runtime, so that Lisp code can call them. The exporting process happens when the module is loaded, even if the definitions are inside another function that is never called, or inside a private `mod`.
 
 ## Input Parameters
 
@@ -81,7 +81,7 @@ See [Custom Types](./custom-types.md) for more details on embedding Rust data st
 
 By default, the function's Lisp name has the form `<feature-prefix>[mod-prefix]<base-name>`.
 - `feature-prefix` is the feature name followed by `-`. This can be customized by the `name`, `defun_prefix`, and `separator` [options](./module.md#options) on `#[emacs::module]`.
-- `mod-prefix` is constructed from the function's Rust module path (with `_` and `::` replaced by `-`). This can be turned off crate-wide, or for individual function, using the option `mod_in_name`.
+- `mod-prefix` is constructed from the function's Rust `mod` path (with `_` and `::` replaced by `-`). This can be turned off crate-wide, or for individual function, using the option `mod_in_name`.
 - `base-name` is the function's Rust name (with `_` replaced by `-`). This can be overridden with the option `name`.
 
 Examples:

src/init.rs

@@ -96,13 +96,13 @@ fn lisp_name(s: &str) -> String {
     s.replace("_", "-")
 }
 
-pub fn lisp_pkg(module_path: &str) -> String {
-    let crate_name = module_path.split("::").nth(0).expect("module_path is empty!");
+pub fn lisp_pkg(mod_path: &str) -> String {
+    let crate_name = mod_path.split("::").nth(0).expect("mod_path is empty!");
     lisp_name(&crate_name)
 }
 
-pub fn lisp_path(module_path: &str) -> String {
-    let split = module_path.split("::");
+pub fn lisp_path(mod_path: &str) -> String {
+    let split = mod_path.split("::");
     let mut path =
         __PREFIX__.try_lock().expect("Failed to acquire read lock of module prefix").join("");
     for segment in split.skip(1) {