From 1b584d1746db717cf36234d3b9eef0a3dce93d3e Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Wed, 26 May 2021 23:11:01 +0800 Subject: [PATCH 1/4] update handlebars to 4.0 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index faba577b..de97f5b7 100644 --- a/Cargo.lock +++ b/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", diff --git a/Cargo.toml b/Cargo.toml index f352880b..79cfc3fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" From 9813802b3e224660f8efe51761169fb14573c4b0 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Fri, 28 May 2021 22:59:56 +0800 Subject: [PATCH 2/4] bump msrv to 1.45 as handlebars 4.0 requires --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 50832060..9e3c7b97 100644 --- a/.github/workflows/main.yml +++ b/.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 From fa3ae53d4625dc45471110651f579585c3aabbb5 Mon Sep 17 00:00:00 2001 From: Atharva Raykar <24277692+tfidfwastaken@users.noreply.github.com> Date: Sat, 5 Jun 2021 22:50:45 +0530 Subject: [PATCH 3/4] Fix typo in documentation a very pedantic ommitted -> omitted --- guide/src/format/summary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/src/format/summary.md b/guide/src/format/summary.md index 92bb3a8c..b0c6399a 100644 --- a/guide/src/format/summary.md +++ b/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 # Summary. This is ignored by the parser however, and - can be ommitted. + can be omitted. ```markdown # Summary ``` From 515a253e97d01c8f3c956ea738d657300c972398 Mon Sep 17 00:00:00 2001 From: josh rotenberg Date: Sat, 5 Jun 2021 08:05:46 -0700 Subject: [PATCH 4/4] doc clarification on markdown list markers doc clarification on markdown list markers shorten --- guide/src/format/summary.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/src/format/summary.md b/guide/src/format/summary.md index 92bb3a8c..3a8e001c 100644 --- a/guide/src/format/summary.md +++ b/guide/src/format/summary.md @@ -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