Revert "remove __non_exhaustive members, add non_exhaustive attribute instead"

This commit is contained in:
Joseph Priou 2022-07-09 17:43:17 +02:00 committed by GitHub
parent 42d6fd5804
commit f92911b8aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions

View File

@ -77,10 +77,10 @@ fn create_missing(src_dir: &Path, summary: &Summary) -> Result<()> {
/// [`iter()`]: #method.iter /// [`iter()`]: #method.iter
/// [`for_each_mut()`]: #method.for_each_mut /// [`for_each_mut()`]: #method.for_each_mut
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
#[non_exhaustive]
pub struct Book { pub struct Book {
/// The sections in this book. /// The sections in this book.
pub sections: Vec<BookItem>, pub sections: Vec<BookItem>,
__non_exhaustive: (),
} }
impl Book { impl Book {
@ -228,7 +228,10 @@ pub(crate) fn load_book_from_disk<P: AsRef<Path>>(summary: &Summary, src_dir: P)
chapters.push(chapter); chapters.push(chapter);
} }
Ok(Book { sections: chapters }) Ok(Book {
sections: chapters,
__non_exhaustive: (),
})
} }
fn load_summary_item<P: AsRef<Path> + Clone>( fn load_summary_item<P: AsRef<Path> + Clone>(

View File

@ -21,7 +21,6 @@ use serde::{Deserialize, Serialize};
/// Extra information for a `Preprocessor` to give them more context when /// Extra information for a `Preprocessor` to give them more context when
/// processing a book. /// processing a book.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[non_exhaustive]
pub struct PreprocessorContext { pub struct PreprocessorContext {
/// The location of the book directory on disk. /// The location of the book directory on disk.
pub root: PathBuf, pub root: PathBuf,
@ -33,6 +32,8 @@ pub struct PreprocessorContext {
pub mdbook_version: String, pub mdbook_version: String,
#[serde(skip)] #[serde(skip)]
pub(crate) chapter_titles: RefCell<HashMap<PathBuf, String>>, pub(crate) chapter_titles: RefCell<HashMap<PathBuf, String>>,
#[serde(skip)]
__non_exhaustive: (),
} }
impl PreprocessorContext { impl PreprocessorContext {
@ -44,6 +45,7 @@ impl PreprocessorContext {
renderer, renderer,
mdbook_version: crate::MDBOOK_VERSION.to_string(), mdbook_version: crate::MDBOOK_VERSION.to_string(),
chapter_titles: RefCell::new(HashMap::new()), chapter_titles: RefCell::new(HashMap::new()),
__non_exhaustive: (),
} }
} }
} }

View File

@ -51,7 +51,6 @@ pub trait Renderer {
/// The context provided to all renderers. /// The context provided to all renderers.
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
#[non_exhaustive]
pub struct RenderContext { pub struct RenderContext {
/// Which version of `mdbook` did this come from (as written in `mdbook`'s /// Which version of `mdbook` did this come from (as written in `mdbook`'s
/// `Cargo.toml`). Useful if you know the renderer is only compatible with /// `Cargo.toml`). Useful if you know the renderer is only compatible with
@ -69,6 +68,8 @@ pub struct RenderContext {
pub destination: PathBuf, pub destination: PathBuf,
#[serde(skip)] #[serde(skip)]
pub(crate) chapter_titles: HashMap<PathBuf, String>, pub(crate) chapter_titles: HashMap<PathBuf, String>,
#[serde(skip)]
__non_exhaustive: (),
} }
impl RenderContext { impl RenderContext {
@ -85,6 +86,7 @@ impl RenderContext {
root: root.into(), root: root.into(),
destination: destination.into(), destination: destination.into(),
chapter_titles: HashMap::new(), chapter_titles: HashMap::new(),
__non_exhaustive: (),
} }
} }