From c63cb014a045642efbbf1363666a4eda247163a3 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 1 Jun 2021 18:25:36 +0300
Subject: updated shlex for jsondocck

---
 src/tools/jsondocck/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/jsondocck/Cargo.toml b/src/tools/jsondocck/Cargo.toml
index a6efc4c9a6b..eb1c422ef72 100644
--- a/src/tools/jsondocck/Cargo.toml
+++ b/src/tools/jsondocck/Cargo.toml
@@ -9,7 +9,7 @@ jsonpath_lib = "0.2"
 getopts = "0.2"
 regex = "1.4"
 lazy_static = "1.4"
-shlex = "0.1"
+shlex = "1.0"
 serde = "1.0"
 serde_json = "1.0"
 fs-err = "2.5.0"
-- 
cgit 1.4.1-3-g733a5


From 5afc594e6294cee451ded335397cade6a9098bd1 Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Tue, 1 Jun 2021 19:44:10 +0300
Subject: replace lazy_static with once_cell, drop direct dependency on serde

---
 Cargo.lock                      |  3 +--
 src/tools/jsondocck/Cargo.toml  |  3 +--
 src/tools/jsondocck/src/main.rs | 12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/tools')

diff --git a/Cargo.lock b/Cargo.lock
index 6e674d7257f..7badb93bce5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1743,9 +1743,8 @@ dependencies = [
  "fs-err",
  "getopts",
  "jsonpath_lib",
- "lazy_static",
+ "once_cell",
  "regex",
- "serde",
  "serde_json",
  "shlex",
 ]
diff --git a/src/tools/jsondocck/Cargo.toml b/src/tools/jsondocck/Cargo.toml
index eb1c422ef72..b5f1554dbe4 100644
--- a/src/tools/jsondocck/Cargo.toml
+++ b/src/tools/jsondocck/Cargo.toml
@@ -8,8 +8,7 @@ edition = "2018"
 jsonpath_lib = "0.2"
 getopts = "0.2"
 regex = "1.4"
-lazy_static = "1.4"
 shlex = "1.0"
-serde = "1.0"
 serde_json = "1.0"
 fs-err = "2.5.0"
+once_cell = "1.0"
diff --git a/src/tools/jsondocck/src/main.rs b/src/tools/jsondocck/src/main.rs
index 216890d59ad..b8ea10f3d22 100644
--- a/src/tools/jsondocck/src/main.rs
+++ b/src/tools/jsondocck/src/main.rs
@@ -1,5 +1,5 @@
 use jsonpath_lib::select;
-use lazy_static::lazy_static;
+use once_cell::sync::Lazy;
 use regex::{Regex, RegexBuilder};
 use serde_json::Value;
 use std::borrow::Cow;
@@ -94,19 +94,19 @@ impl fmt::Display for CommandKind {
     }
 }
 
-lazy_static! {
-    static ref LINE_PATTERN: Regex = RegexBuilder::new(
+static LINE_PATTERN: Lazy<Regex> = Lazy::new(|| {
+    RegexBuilder::new(
         r#"
         \s(?P<invalid>!?)@(?P<negated>!?)
         (?P<cmd>[A-Za-z]+(?:-[A-Za-z]+)*)
         (?P<args>.*)$
-    "#
+    "#,
     )
     .ignore_whitespace(true)
     .unicode(true)
     .build()
-    .unwrap();
-}
+    .unwrap()
+});
 
 fn print_err(msg: &str, lineno: usize) {
     eprintln!("Invalid command: {} on line {}", msg, lineno)
-- 
cgit 1.4.1-3-g733a5


From 98c90522a61f434e6e72a292ab639c47db3c2464 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Thu, 3 Jun 2021 13:21:04 -0700
Subject: Fix linkcheck script from getting out of sync.

---
 src/tools/linkchecker/linkcheck.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/linkchecker/linkcheck.sh b/src/tools/linkchecker/linkcheck.sh
index b68053c76be..7f226aab7d7 100755
--- a/src/tools/linkchecker/linkcheck.sh
+++ b/src/tools/linkchecker/linkcheck.sh
@@ -85,11 +85,11 @@ fi
 if [ ! -e "linkchecker/main.rs" ] || [ "$iterative" = "0" ]
 then
     echo "Downloading linkchecker source..."
+    nightly_hash=$(rustc +nightly -Vv | grep commit-hash | cut -f2 -d" ")
+    url="https://raw.githubusercontent.com/rust-lang/rust"
     mkdir linkchecker
-    curl -o linkchecker/Cargo.toml \
-        https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/Cargo.toml
-    curl -o linkchecker/main.rs \
-        https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/main.rs
+    curl -o linkchecker/Cargo.toml ${url}/${nightly_hash}/src/tools/linkchecker/Cargo.toml
+    curl -o linkchecker/main.rs ${url}/${nightly_hash}/src/tools/linkchecker/main.rs
 fi
 
 echo "Building book \"$book_name\"..."
-- 
cgit 1.4.1-3-g733a5


From 095f09a5bf1433ca4003728fd95682dd34b19dca Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Thu, 3 Jun 2021 13:21:21 -0700
Subject: Build linkcheck script as release to run faster.

---
 src/tools/linkchecker/linkcheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/tools')

diff --git a/src/tools/linkchecker/linkcheck.sh b/src/tools/linkchecker/linkcheck.sh
index 7f226aab7d7..9eeebf444a4 100755
--- a/src/tools/linkchecker/linkcheck.sh
+++ b/src/tools/linkchecker/linkcheck.sh
@@ -106,7 +106,7 @@ else
     check_path="linkcheck/$book_name"
 fi
 echo "Running linkchecker on \"$check_path\"..."
-cargo run --manifest-path=linkchecker/Cargo.toml -- "$check_path"
+cargo run --release --manifest-path=linkchecker/Cargo.toml -- "$check_path"
 
 if [ "$iterative" = "0" ]
 then
-- 
cgit 1.4.1-3-g733a5