Merge pull request #1573 from ehuss/release-next

Update to 0.4.10

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
             rust: stable
           - build: msrv
             os: ubuntu-latest
-            rust: 1.42.0
+            rust: 1.45.0
     steps:
     - uses: actions/checkout@master
     - name: Install Rust

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## mdBook 0.4.10
+[2f7293a...dc2062a](https://github.com/rust-lang/mdBook/compare/2f7293a...dc2062a)
+
+### Changed
+- Reverted breaking change in 0.4.9 that removed the `__non_exhaustive` marker
+  on the `Book` struct.
+  [#1572](https://github.com/rust-lang/mdBook/pull/1572)
+- Updated handlebars to 4.0.
+  [#1550](https://github.com/rust-lang/mdBook/pull/1550)
+- Removed the `chapter_begin` id on the print page's chapter separators.
+  [#1541](https://github.com/rust-lang/mdBook/pull/1541)
+
 ## mdBook 0.4.9
 [7e01cf9...d325c60](https://github.com/rust-lang/mdBook/compare/7e01cf9...d325c60)
 

Cargo.lock

@@ -511,9 +511,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "3.5.5"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3"
+checksum = "28f0fe89affef47e2c9729030a8f6e79df34cb66b8a44ecf91dad43f31150559"
 dependencies = [
  "log",
  "pest",
@@ -800,7 +800,7 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
 name = "mdbook"
-version = "0.4.9"
+version = "0.4.10"
 dependencies = [
  "ammonia",
  "anyhow",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mdbook"
-version = "0.4.9"
+version = "0.4.10"
 authors = [
     "Mathieu David <mathieudavid@mathieudavid.org>",
     "Michael-F-Bryan <michaelfbryan@gmail.com>",
@@ -20,7 +20,7 @@ anyhow = "1.0.28"
 chrono = "0.4"
 clap = "2.24"
 env_logger = "0.7.1"
-handlebars = "3.0"
+handlebars = "4.0"
 lazy_static = "1.0"
 log = "0.4"
 memchr = "2.0"

guide/src/format/summary.md

@@ -13,7 +13,7 @@ to be ignored at best, or may cause an error when attempting to build the book.
 
 1. ***Title*** - While optional, it's common practice to begin with a title, generally <code
    class="language-markdown"># Summary</code>. This is ignored by the parser however, and
-   can be ommitted.
+   can be omitted.
    ```markdown
    # Summary
    ```
@@ -54,8 +54,8 @@ to be ignored at best, or may cause an error when attempting to build the book.
 
    - [Another Chapter](relative/path/to/markdown4.md)
    ```
-   Numbered chapters can be denoted with either `-` or `*`.
-
+   Numbered chapters can be denoted with either `-` or `*` (do not mix delimiters). 
+   
 1. ***Suffix Chapter*** - Like prefix chapters, suffix chapters are unnumbered, but they come after 
    numbered chapters.
    ```markdown

src/book/book.rs

@@ -74,10 +74,10 @@ fn create_missing(src_dir: &Path, summary: &Summary) -> Result<()> {
 /// [`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 {
@@ -225,7 +225,10 @@ pub(crate) fn load_book_from_disk<P: AsRef<Path>>(summary: &Summary, src_dir: P)
         chapters.push(chapter);
     }
 
-    Ok(Book { sections: chapters })
+    Ok(Book {
+        sections: chapters,
+        __non_exhaustive: (),
+    })
 }
 
 fn load_summary_item<P: AsRef<Path> + Clone>(

src/renderer/html_handlebars/hbs_renderer.rs

@@ -63,7 +63,8 @@ impl HtmlHandlebars {
             // Add page break between chapters
             // See https://developer.mozilla.org/en-US/docs/Web/CSS/break-before and https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-before
             // Add both two CSS properties because of the compatibility issue
-            print_content.push_str(r#"<div id="chapter_begin" style="break-before: page; page-break-before: always;"></div>"#);
+            print_content
+                .push_str(r#"<div style="break-before: page; page-break-before: always;"></div>"#);
         }
         print_content.push_str(&fixed_content);