Merge pull request #2779 from ehuss/non_exhaustive

Switch all public types to non_exhaustive

Author: ehuss

Cargo.toml

@@ -9,6 +9,9 @@ members = [
 all = { level = "allow", priority = -2 }
 correctness = { level = "warn", priority = -1 }
 complexity = { level = "warn", priority = -1 }
+exhaustive_enums = "warn"
+exhaustive_structs = "warn"
+manual_non_exhaustive = "warn"
 
 [workspace.lints.rust]
 missing_docs = "warn"

crates/mdbook-core/src/book.rs

@@ -16,10 +16,10 @@ use std::path::PathBuf;
 /// [`iter()`]: #method.iter
 /// [`for_each_mut()`]: #method.for_each_mut
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub struct Book {
     /// The sections in this book.
     pub sections: Vec<BookItem>,
-    __non_exhaustive: (),
 }
 
 impl Book {
@@ -30,10 +30,7 @@ impl Book {
 
     /// Creates a new book with the given items.
     pub fn new_with_items(items: Vec<BookItem>) -> Book {
-        Book {
-            sections: items,
-            __non_exhaustive: (),
-        }
+        Book { sections: items }
     }
 
     /// Get a depth-first iterator over the items in the book.
@@ -81,6 +78,7 @@ where
 
 /// Enum representing any type of item which can be added to a book.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub enum BookItem {
     /// A nested chapter.
     Chapter(Chapter),
@@ -99,6 +97,7 @@ impl From<Chapter> for BookItem {
 /// The representation of a "chapter", usually mapping to a single file on
 /// disk however it may contain multiple sub-chapters.
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub struct Chapter {
     /// The chapter's name.
     pub name: String,
@@ -180,7 +179,14 @@ impl Display for Chapter {
 /// A section number like "1.2.3", basically just a newtype'd `Vec<u32>` with
 /// a pretty `Display` impl.
 #[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize)]
-pub struct SectionNumber(pub Vec<u32>);
+pub struct SectionNumber(Vec<u32>);
+
+impl SectionNumber {
+    /// Creates a new [`SectionNumber`].
+    pub fn new(numbers: impl Into<Vec<u32>>) -> SectionNumber {
+        SectionNumber(numbers.into())
+    }
+}
 
 impl Display for SectionNumber {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {

crates/mdbook-core/src/config.rs

@@ -64,6 +64,7 @@ use toml::value::Table;
 /// The overall configuration object for MDBook, essentially an in-memory
 /// representation of `book.toml`.
 #[derive(Debug, Clone, PartialEq)]
+#[non_exhaustive]
 pub struct Config {
     /// Metadata about the book.
     pub book: BookConfig,
@@ -386,6 +387,7 @@ fn is_legacy_format(table: &Value) -> bool {
 /// loading it from disk.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct BookConfig {
     /// The book's title.
     pub title: Option<String>,
@@ -429,6 +431,7 @@ impl BookConfig {
 
 /// Text direction to use for HTML output
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub enum TextDirection {
     /// Left to right.
     #[serde(rename = "ltr")]
@@ -454,6 +457,7 @@ impl TextDirection {
 /// Configuration for the build procedure.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct BuildConfig {
     /// Where to put built artefacts relative to the book's root directory.
     pub build_dir: PathBuf,
@@ -481,13 +485,15 @@ impl Default for BuildConfig {
 /// Configuration for the Rust compiler(e.g., for playground)
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct RustConfig {
     /// Rust edition used in playground
     pub edition: Option<RustEdition>,
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
 /// Rust edition to use for the code.
+#[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize)]
+#[non_exhaustive]
 pub enum RustEdition {
     /// The 2024 edition of Rust
     #[serde(rename = "2024")]
@@ -506,6 +512,7 @@ pub enum RustEdition {
 /// Configuration for the HTML renderer.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct HtmlConfig {
     /// The theme directory, if specified.
     pub theme: Option<PathBuf>,
@@ -625,6 +632,7 @@ impl HtmlConfig {
 /// Configuration for how to render the print icon, print.html, and print.css.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct Print {
     /// Whether print support is enabled.
     pub enable: bool,
@@ -644,6 +652,7 @@ impl Default for Print {
 /// Configuration for how to fold chapters of sidebar.
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct Fold {
     /// When off, all folds are open. Default: `false`.
     pub enable: bool,
@@ -656,6 +665,7 @@ pub struct Fold {
 /// Configuration for tweaking how the HTML renderer handles the playground.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct Playground {
     /// Should playground snippets be editable? Default: `false`.
     pub editable: bool,
@@ -685,6 +695,7 @@ impl Default for Playground {
 /// Configuration for tweaking how the HTML renderer handles code blocks.
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct Code {
     /// A prefix string to hide lines per language (one or more chars).
     pub hidelines: HashMap<String, String>,
@@ -693,6 +704,7 @@ pub struct Code {
 /// Configuration of the search functionality of the HTML renderer.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct Search {
     /// Enable the search feature. Default: `true`.
     pub enable: bool,
@@ -750,6 +762,7 @@ impl Default for Search {
 /// Search options for chapters (or paths).
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
 #[serde(default, rename_all = "kebab-case")]
+#[non_exhaustive]
 pub struct SearchChapterSettings {
     /// Whether or not indexing is enabled, default `true`.
     pub enable: Option<bool>,

crates/mdbook-driver/src/builtin_preprocessors/index.rs

@@ -8,6 +8,7 @@ use std::{path::Path, sync::LazyLock};
 /// A preprocessor for converting file name `README.md` to `index.md` since
 /// `README.md` is the de facto index file in markdown-based documentation.
 #[derive(Default)]
+#[non_exhaustive]
 pub struct IndexPreprocessor;
 
 impl IndexPreprocessor {

crates/mdbook-driver/src/builtin_preprocessors/links.rs

@@ -26,6 +26,7 @@ const MAX_LINK_NESTED_DEPTH: usize = 10;
 /// - `{{# playground}}` - Insert runnable Rust files
 /// - `{{# title}}` - Override \<title\> of a webpage.
 #[derive(Default)]
+#[non_exhaustive]
 pub struct LinkPreprocessor;
 
 impl LinkPreprocessor {

crates/mdbook-driver/src/builtin_renderers/markdown_renderer.rs

@@ -5,9 +5,10 @@ use mdbook_core::utils;
 use mdbook_renderer::{RenderContext, Renderer};
 use std::fs;
 
-#[derive(Default)]
 /// A renderer to output the Markdown after the preprocessors have run. Mostly useful
 /// when debugging preprocessors.
+#[derive(Default)]
+#[non_exhaustive]
 pub struct MarkdownRenderer;
 
 impl MarkdownRenderer {

crates/mdbook-driver/src/load.rs

@@ -95,6 +95,7 @@ fn load_summary_item<P: AsRef<Path> + Clone>(
         SummaryItem::Separator => Ok(BookItem::Separator),
         SummaryItem::Link(link) => load_chapter(link, src_dir, parent_names).map(BookItem::Chapter),
         SummaryItem::PartTitle(title) => Ok(BookItem::PartTitle(title.clone())),
+        _ => panic!("SummaryItem {item:?} not covered"),
     }
 }
 
@@ -194,7 +195,7 @@ And here is some \
             .unwrap();
 
         let mut second = Link::new("Nested Chapter 1", &second_path);
-        second.number = Some(SectionNumber(vec![1, 2]));
+        second.number = Some(SectionNumber::new([1, 2]));
 
         root.nested_items.push(second.clone().into());
         root.nested_items.push(SummaryItem::Separator);
@@ -252,28 +253,21 @@ And here is some \
     fn load_recursive_link_with_separators() {
         let (root, temp) = nested_links();
 
-        let nested = Chapter {
-            name: String::from("Nested Chapter 1"),
-            content: String::from("Hello World!"),
-            number: Some(SectionNumber(vec![1, 2])),
-            path: Some(PathBuf::from("second.md")),
-            source_path: Some(PathBuf::from("second.md")),
-            parent_names: vec![String::from("Chapter 1")],
-            sub_items: Vec::new(),
-        };
-        let should_be = BookItem::Chapter(Chapter {
-            name: String::from("Chapter 1"),
-            content: String::from(DUMMY_SRC),
-            number: None,
-            path: Some(PathBuf::from("chapter_1.md")),
-            source_path: Some(PathBuf::from("chapter_1.md")),
-            parent_names: Vec::new(),
-            sub_items: vec![
-                BookItem::Chapter(nested.clone()),
-                BookItem::Separator,
-                BookItem::Chapter(nested),
-            ],
-        });
+        let mut nested = Chapter::new(
+            "Nested Chapter 1",
+            String::from("Hello World!"),
+            "second.md",
+            vec![String::from("Chapter 1")],
+        );
+        nested.number = Some(SectionNumber::new([1, 2]));
+        let mut chapter =
+            Chapter::new("Chapter 1", String::from(DUMMY_SRC), "chapter_1.md", vec![]);
+        chapter.sub_items = vec![
+            BookItem::Chapter(nested.clone()),
+            BookItem::Separator,
+            BookItem::Chapter(nested),
+        ];
+        let should_be = BookItem::Chapter(chapter);
 
         let got = load_summary_item(&SummaryItem::Link(root), temp.path(), Vec::new()).unwrap();
         assert_eq!(got, should_be);
@@ -282,17 +276,15 @@ And here is some \
     #[test]
     fn load_a_book_with_a_single_chapter() {
         let (link, temp) = dummy_link();
-        let summary = Summary {
-            numbered_chapters: vec![SummaryItem::Link(link)],
-            ..Default::default()
-        };
-        let sections = vec![BookItem::Chapter(Chapter {
-            name: String::from("Chapter 1"),
-            content: String::from(DUMMY_SRC),
-            path: Some(PathBuf::from("chapter_1.md")),
-            source_path: Some(PathBuf::from("chapter_1.md")),
-            ..Default::default()
-        })];
+        let mut summary = Summary::default();
+        summary.numbered_chapters = vec![SummaryItem::Link(link)];
+        let chapter = Chapter::new(
+            "Chapter 1",
+            String::from(DUMMY_SRC),
+            PathBuf::from("chapter_1.md"),
+            vec![],
+        );
+        let sections = vec![BookItem::Chapter(chapter)];
         let should_be = Book::new_with_items(sections);
 
         let got = load_book_from_disk(&summary, temp.path()).unwrap();
@@ -303,16 +295,9 @@ And here is some \
     #[test]
     fn cant_load_chapters_with_an_empty_path() {
         let (_, temp) = dummy_link();
-        let summary = Summary {
-            numbered_chapters: vec![SummaryItem::Link(Link {
-                name: String::from("Empty"),
-                location: Some(PathBuf::from("")),
-                ..Default::default()
-            })],
-
-            ..Default::default()
-        };
-
+        let mut summary = Summary::default();
+        let link = Link::new("Empty", "");
+        summary.numbered_chapters = vec![SummaryItem::Link(link)];
         let got = load_book_from_disk(&summary, temp.path());
         assert!(got.is_err());
     }
@@ -323,14 +308,9 @@ And here is some \
         let dir = temp.path().join("nested");
         fs::create_dir(&dir).unwrap();
 
-        let summary = Summary {
-            numbered_chapters: vec![SummaryItem::Link(Link {
-                name: String::from("nested"),
-                location: Some(dir),
-                ..Default::default()
-            })],
-            ..Default::default()
-        };
+        let mut summary = Summary::default();
+        let link = Link::new("nested", dir);
+        summary.numbered_chapters = vec![SummaryItem::Link(link)];
 
         let got = load_book_from_disk(&summary, temp.path());
         assert!(got.is_err());

crates/mdbook-driver/src/mdbook.rs

@@ -136,6 +136,7 @@ impl MDBook {
     ///         BookItem::Chapter(ref chapter) => {},
     ///         BookItem::Separator => {},
     ///         BookItem::PartTitle(ref title) => {}
+    ///         _ => {}
     ///     }
     /// }
     ///
@@ -329,6 +330,7 @@ impl MDBook {
                         RustEdition::E2024 => {
                             cmd.args(["--edition", "2024"]);
                         }
+                        _ => panic!("RustEdition {edition:?} not covered"),
                     }
                 }
 

crates/mdbook-driver/src/mdbook/tests.rs

@@ -230,7 +230,7 @@ fn config_respects_preprocessor_selection() {
 
     let cfg = Config::from_str(cfg_str).unwrap();
 
-    let html_renderer = HtmlHandlebars;
+    let html_renderer = HtmlHandlebars::default();
     let pre = LinkPreprocessor::new();
 
     let should_run = preprocessor_should_run(&pre, &html_renderer, &cfg).unwrap();