Skip to content

Commit 2773456

Browse files
ehussehuss
committedFeb 17, 2025
Move error_index_generator to the rustbook workspace
I had forgotten that error_index_generator is using mdbook. This moves it to be part of the rustbook workspace so that it can share the dependency with rustbook.
1 parent 32b1bff commit 2773456

File tree

7 files changed

+10
-210
lines changed

7 files changed

+10
-210
lines changed
 

‎Cargo.lock

+1-193
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,6 @@ version = "0.2.21"
6161
source = "registry+https://github.com/rust-lang/crates.io-index"
6262
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
6363

64-
[[package]]
65-
name = "ammonia"
66-
version = "4.0.0"
67-
source = "registry+https://github.com/rust-lang/crates.io-index"
68-
checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459"
69-
dependencies = [
70-
"html5ever",
71-
"maplit",
72-
"once_cell",
73-
"tendril",
74-
"url",
75-
]
76-
7764
[[package]]
7865
name = "android-tzdata"
7966
version = "0.1.1"
@@ -513,16 +500,6 @@ dependencies = [
513500
"anstyle",
514501
"clap_lex",
515502
"strsim",
516-
"terminal_size",
517-
]
518-
519-
[[package]]
520-
name = "clap_complete"
521-
version = "4.5.42"
522-
source = "registry+https://github.com/rust-lang/crates.io-index"
523-
checksum = "33a7e468e750fa4b6be660e8b5651ad47372e8fb114030b594c2d75d48c5ffd0"
524-
dependencies = [
525-
"clap",
526503
]
527504

528505
[[package]]
@@ -1084,18 +1061,6 @@ version = "1.13.0"
10841061
source = "registry+https://github.com/rust-lang/crates.io-index"
10851062
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
10861063

1087-
[[package]]
1088-
name = "elasticlunr-rs"
1089-
version = "3.0.2"
1090-
source = "registry+https://github.com/rust-lang/crates.io-index"
1091-
checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571"
1092-
dependencies = [
1093-
"regex",
1094-
"serde",
1095-
"serde_derive",
1096-
"serde_json",
1097-
]
1098-
10991064
[[package]]
11001065
name = "elsa"
11011066
version = "1.11.0"
@@ -1159,13 +1124,6 @@ dependencies = [
11591124
"windows-sys 0.59.0",
11601125
]
11611126

1162-
[[package]]
1163-
name = "error_index_generator"
1164-
version = "0.0.0"
1165-
dependencies = [
1166-
"mdbook",
1167-
]
1168-
11691127
[[package]]
11701128
name = "expect-test"
11711129
version = "1.5.1"
@@ -1517,22 +1475,6 @@ dependencies = [
15171475
"serde",
15181476
]
15191477

1520-
[[package]]
1521-
name = "handlebars"
1522-
version = "6.3.0"
1523-
source = "registry+https://github.com/rust-lang/crates.io-index"
1524-
checksum = "3d6b224b95c1e668ac0270325ad563b2eef1469fbbb8959bc7c692c844b813d9"
1525-
dependencies = [
1526-
"derive_builder",
1527-
"log",
1528-
"num-order",
1529-
"pest",
1530-
"pest_derive",
1531-
"serde",
1532-
"serde_json",
1533-
"thiserror 2.0.11",
1534-
]
1535-
15361478
[[package]]
15371479
name = "hashbrown"
15381480
version = "0.14.5"
@@ -2189,12 +2131,6 @@ version = "0.1.1"
21892131
source = "registry+https://github.com/rust-lang/crates.io-index"
21902132
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
21912133

2192-
[[package]]
2193-
name = "maplit"
2194-
version = "1.0.2"
2195-
source = "registry+https://github.com/rust-lang/crates.io-index"
2196-
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
2197-
21982134
[[package]]
21992135
name = "markup5ever"
22002136
version = "0.12.1"
@@ -2228,34 +2164,6 @@ dependencies = [
22282164
"digest",
22292165
]
22302166

2231-
[[package]]
2232-
name = "mdbook"
2233-
version = "0.4.43"
2234-
source = "registry+https://github.com/rust-lang/crates.io-index"
2235-
checksum = "fe1f98b8d66e537d2f0ba06e7dec4f44001deec539a2d18bfc102d6a86189148"
2236-
dependencies = [
2237-
"ammonia",
2238-
"anyhow",
2239-
"chrono",
2240-
"clap",
2241-
"clap_complete",
2242-
"elasticlunr-rs",
2243-
"env_logger",
2244-
"handlebars",
2245-
"log",
2246-
"memchr",
2247-
"once_cell",
2248-
"opener",
2249-
"pulldown-cmark 0.10.3",
2250-
"regex",
2251-
"serde",
2252-
"serde_json",
2253-
"shlex",
2254-
"tempfile",
2255-
"toml 0.5.11",
2256-
"topological-sort",
2257-
]
2258-
22592167
[[package]]
22602168
name = "measureme"
22612169
version = "11.0.1"
@@ -2483,21 +2391,6 @@ dependencies = [
24832391
"num-traits",
24842392
]
24852393

2486-
[[package]]
2487-
name = "num-modular"
2488-
version = "0.6.1"
2489-
source = "registry+https://github.com/rust-lang/crates.io-index"
2490-
checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
2491-
2492-
[[package]]
2493-
name = "num-order"
2494-
version = "1.2.0"
2495-
source = "registry+https://github.com/rust-lang/crates.io-index"
2496-
checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
2497-
dependencies = [
2498-
"num-modular",
2499-
]
2500-
25012394
[[package]]
25022395
name = "num-rational"
25032396
version = "0.4.2"
@@ -2718,51 +2611,6 @@ dependencies = [
27182611
"libc",
27192612
]
27202613

2721-
[[package]]
2722-
name = "pest"
2723-
version = "2.7.15"
2724-
source = "registry+https://github.com/rust-lang/crates.io-index"
2725-
checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
2726-
dependencies = [
2727-
"memchr",
2728-
"thiserror 2.0.11",
2729-
"ucd-trie",
2730-
]
2731-
2732-
[[package]]
2733-
name = "pest_derive"
2734-
version = "2.7.15"
2735-
source = "registry+https://github.com/rust-lang/crates.io-index"
2736-
checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
2737-
dependencies = [
2738-
"pest",
2739-
"pest_generator",
2740-
]
2741-
2742-
[[package]]
2743-
name = "pest_generator"
2744-
version = "2.7.15"
2745-
source = "registry+https://github.com/rust-lang/crates.io-index"
2746-
checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
2747-
dependencies = [
2748-
"pest",
2749-
"pest_meta",
2750-
"proc-macro2",
2751-
"quote",
2752-
"syn 2.0.96",
2753-
]
2754-
2755-
[[package]]
2756-
name = "pest_meta"
2757-
version = "2.7.15"
2758-
source = "registry+https://github.com/rust-lang/crates.io-index"
2759-
checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
2760-
dependencies = [
2761-
"once_cell",
2762-
"pest",
2763-
"sha2",
2764-
]
2765-
27662614
[[package]]
27672615
name = "phf"
27682616
version = "0.11.3"
@@ -2921,18 +2769,6 @@ dependencies = [
29212769
"unicase",
29222770
]
29232771

2924-
[[package]]
2925-
name = "pulldown-cmark"
2926-
version = "0.10.3"
2927-
source = "registry+https://github.com/rust-lang/crates.io-index"
2928-
checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
2929-
dependencies = [
2930-
"bitflags",
2931-
"memchr",
2932-
"pulldown-cmark-escape 0.10.1",
2933-
"unicase",
2934-
]
2935-
29362772
[[package]]
29372773
name = "pulldown-cmark"
29382774
version = "0.11.3"
@@ -2941,16 +2777,10 @@ checksum = "679341d22c78c6c649893cbd6c3278dcbe9fc4faa62fea3a9296ae2b50c14625"
29412777
dependencies = [
29422778
"bitflags",
29432779
"memchr",
2944-
"pulldown-cmark-escape 0.11.0",
2780+
"pulldown-cmark-escape",
29452781
"unicase",
29462782
]
29472783

2948-
[[package]]
2949-
name = "pulldown-cmark-escape"
2950-
version = "0.10.1"
2951-
source = "registry+https://github.com/rust-lang/crates.io-index"
2952-
checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3"
2953-
29542784
[[package]]
29552785
name = "pulldown-cmark-escape"
29562786
version = "0.11.0"
@@ -5310,16 +5140,6 @@ dependencies = [
53105140
"winapi-util",
53115141
]
53125142

5313-
[[package]]
5314-
name = "terminal_size"
5315-
version = "0.4.1"
5316-
source = "registry+https://github.com/rust-lang/crates.io-index"
5317-
checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
5318-
dependencies = [
5319-
"rustix",
5320-
"windows-sys 0.59.0",
5321-
]
5322-
53235143
[[package]]
53245144
name = "termize"
53255145
version = "0.1.1"
@@ -5560,12 +5380,6 @@ dependencies = [
55605380
"winnow",
55615381
]
55625382

5563-
[[package]]
5564-
name = "topological-sort"
5565-
version = "0.2.2"
5566-
source = "registry+https://github.com/rust-lang/crates.io-index"
5567-
checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
5568-
55695383
[[package]]
55705384
name = "tracing"
55715385
version = "0.1.37"
@@ -5686,12 +5500,6 @@ dependencies = [
56865500
"regex-lite",
56875501
]
56885502

5689-
[[package]]
5690-
name = "ucd-trie"
5691-
version = "0.1.7"
5692-
source = "registry+https://github.com/rust-lang/crates.io-index"
5693-
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
5694-
56955503
[[package]]
56965504
name = "ui_test"
56975505
version = "0.26.5"

‎Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ members = [
1313
"src/tools/clippy/clippy_dev",
1414
"src/tools/compiletest",
1515
"src/tools/run-make-support",
16-
"src/tools/error_index_generator",
1716
"src/tools/linkchecker",
1817
"src/tools/lint-docs",
1918
"src/tools/miropt-test-tools",

‎src/bootstrap/src/utils/proc_macro_deps.rs

-15
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,31 @@ pub static CRATES: &[&str] = &[
66
"annotate-snippets",
77
"anstyle",
88
"basic-toml",
9-
"block-buffer",
109
"bumpalo",
11-
"cfg-if",
12-
"cpufeatures",
13-
"crypto-common",
1410
"darling",
1511
"darling_core",
1612
"derive_builder_core",
17-
"digest",
1813
"fluent-bundle",
1914
"fluent-langneg",
2015
"fluent-syntax",
2116
"fnv",
22-
"generic-array",
2317
"heck",
2418
"ident_case",
2519
"intl-memoizer",
2620
"intl_pluralrules",
27-
"libc",
2821
"log",
2922
"memchr",
3023
"mime",
3124
"mime_guess",
3225
"minimal-lexical",
3326
"nom",
3427
"num-conv",
35-
"once_cell",
36-
"pest",
37-
"pest_generator",
38-
"pest_meta",
3928
"proc-macro2",
4029
"quote",
4130
"rinja_parser",
4231
"rustc-hash",
4332
"self_cell",
4433
"serde",
45-
"sha2",
4634
"smallvec",
4735
"stable_deref_trait",
4836
"strsim",
@@ -52,15 +40,12 @@ pub static CRATES: &[&str] = &[
5240
"time-core",
5341
"tinystr",
5442
"type-map",
55-
"typenum",
56-
"ucd-trie",
5743
"unic-langid",
5844
"unic-langid-impl",
5945
"unic-langid-macros",
6046
"unicase",
6147
"unicode-ident",
6248
"unicode-width",
63-
"version_check",
6449
"wasm-bindgen-backend",
6550
"wasm-bindgen-macro-support",
6651
"wasm-bindgen-shared",

‎src/tools/error_index_generator/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "error_index_generator"
33
version = "0.0.0"
44
edition = "2021"
5+
workspace = "../rustbook"
56

67
[dependencies]
78
mdbook = { version = "0.4", default-features = false, features = ["search"] }

‎src/tools/rustbook/Cargo.lock

+7
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,13 @@ dependencies = [
446446
"windows-sys",
447447
]
448448

449+
[[package]]
450+
name = "error_index_generator"
451+
version = "0.0.0"
452+
dependencies = [
453+
"mdbook",
454+
]
455+
449456
[[package]]
450457
name = "fastrand"
451458
version = "2.3.0"

‎src/tools/rustbook/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
members = ["../error_index_generator"]
23

34
[package]
45
name = "rustbook"

‎src/tools/tidy/src/deps.rs

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ const EXCEPTIONS: ExceptionList = &[
9999
("dissimilar", "Apache-2.0"), // rustdoc, rustc_lexer (few tests) via expect-test, (dev deps)
100100
("fluent-langneg", "Apache-2.0"), // rustc (fluent translations)
101101
("foldhash", "Zlib"), // rustc
102-
("mdbook", "MPL-2.0"), // mdbook
103102
("option-ext", "MPL-2.0"), // cargo-miri (via `directories`)
104103
("rustc_apfloat", "Apache-2.0 WITH LLVM-exception"), // rustc (license is the same as LLVM uses)
105104
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 // cargo/... (because of serde)

0 commit comments

Comments
 (0)
Please sign in to comment.