Skip to content

Commit 36bf7c8

Browse files
authored
Remove bookrunner (rust-lang#3123)
We never updated the books and do not actually require the evaluation data anymore.
1 parent dc09780 commit 36bf7c8

File tree

197 files changed

+3
-7388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+3
-7388
lines changed

.github/workflows/kani.yml

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -96,39 +96,14 @@ jobs:
9696
env:
9797
RUST_TEST_THREADS: 1
9898

99-
bookrunner:
99+
documentation:
100100
runs-on: ubuntu-20.04
101101
permissions:
102102
contents: write
103103
steps:
104104
- name: Checkout Kani
105105
uses: actions/checkout@v4
106106

107-
- name: Setup Kani Dependencies
108-
uses: ./.github/actions/setup
109-
with:
110-
os: ubuntu-20.04
111-
112-
- name: Build Kani
113-
run: cargo build-dev
114-
115-
- name: Install book runner dependencies
116-
run: ./scripts/setup/install_bookrunner_deps.sh
117-
118-
- name: Generate book runner report
119-
run: cargo run -p bookrunner
120-
env:
121-
DOC_RUST_LANG_ORG_CHANNEL: nightly
122-
123-
- name: Print book runner text results
124-
run: cat build/output/latest/html/bookrunner.txt
125-
126-
- name: Print book runner failures grouped by stage
127-
run: python3 scripts/ci/bookrunner_failures_by_stage.py build/output/latest/html/index.html
128-
129-
- name: Detect unexpected book runner failures
130-
run: ./scripts/ci/detect_bookrunner_failures.sh build/output/latest/html/bookrunner.txt
131-
132107
- name: Install book dependencies
133108
run: ./scripts/setup/ubuntu/install_doc_deps.sh
134109

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,8 @@ package-lock.json
7474
tests/rustdoc-gui/src/**.lock
7575

7676
# Before adding new lines, see the comment at the top.
77-
/.litani_cache_dir
7877
/.ninja_deps
7978
/.ninja_log
80-
/tests/bookrunner
8179
*Cargo.lock
8280
tests/kani-dependency-test/diamond-dependency/build
8381
tests/kani-multicrate/type-mismatch/mismatch/target

.gitmodules

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
[submodule "src/doc/nomicon"]
2-
path = tools/bookrunner/rust-doc/nomicon
3-
url = https://github.com/rust-lang/nomicon.git
4-
[submodule "src/doc/reference"]
5-
path = tools/bookrunner/rust-doc/reference
6-
url = https://github.com/rust-lang/reference.git
7-
[submodule "src/doc/rust-by-example"]
8-
path = tools/bookrunner/rust-doc/rust-by-example
9-
url = https://github.com/rust-lang/rust-by-example.git
101
[submodule "firecracker"]
112
path = firecracker
123
url = https://github.com/firecracker-microvm/firecracker.git

Cargo.lock

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
# It is not intended for manual editing.
33
version = 3
44

5-
[[package]]
6-
name = "Inflector"
7-
version = "0.11.4"
8-
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
10-
dependencies = [
11-
"lazy_static",
12-
"regex",
13-
]
14-
155
[[package]]
166
name = "ahash"
177
version = "0.8.11"
@@ -105,20 +95,6 @@ version = "2.5.0"
10595
source = "registry+https://github.com/rust-lang/crates.io-index"
10696
checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
10797

108-
[[package]]
109-
name = "bookrunner"
110-
version = "0.1.0"
111-
dependencies = [
112-
"Inflector",
113-
"pulldown-cmark",
114-
"pulldown-cmark-escape",
115-
"rustdoc",
116-
"serde",
117-
"serde_json",
118-
"toml",
119-
"walkdir",
120-
]
121-
12298
[[package]]
12399
name = "build-kani"
124100
version = "0.48.0"
@@ -764,23 +740,6 @@ dependencies = [
764740
"unicode-ident",
765741
]
766742

767-
[[package]]
768-
name = "pulldown-cmark"
769-
version = "0.10.2"
770-
source = "registry+https://github.com/rust-lang/crates.io-index"
771-
checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c"
772-
dependencies = [
773-
"bitflags 2.5.0",
774-
"memchr",
775-
"unicase",
776-
]
777-
778-
[[package]]
779-
name = "pulldown-cmark-escape"
780-
version = "0.10.0"
781-
source = "registry+https://github.com/rust-lang/crates.io-index"
782-
checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b"
783-
784743
[[package]]
785744
name = "quote"
786745
version = "1.0.35"
@@ -899,13 +858,6 @@ version = "0.1.23"
899858
source = "registry+https://github.com/rust-lang/crates.io-index"
900859
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
901860

902-
[[package]]
903-
name = "rustdoc"
904-
version = "0.0.0"
905-
dependencies = [
906-
"pulldown-cmark",
907-
]
908-
909861
[[package]]
910862
name = "rustix"
911863
version = "0.38.32"
@@ -1272,15 +1224,6 @@ dependencies = [
12721224
"tracing-serde",
12731225
]
12741226

1275-
[[package]]
1276-
name = "unicase"
1277-
version = "2.7.0"
1278-
source = "registry+https://github.com/rust-lang/crates.io-index"
1279-
checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
1280-
dependencies = [
1281-
"version_check",
1282-
]
1283-
12841227
[[package]]
12851228
name = "unicode-ident"
12861229
version = "1.0.12"

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,11 @@ strip = "debuginfo"
3838
members = [
3939
"library/kani",
4040
"library/std",
41-
"tools/bookrunner",
4241
"tools/compiletest",
4342
"tools/build-kani",
4443
"kani-driver",
4544
"kani-compiler",
4645
"kani_metadata",
47-
# `librustdoc` is still needed by bookrunner.
48-
"tools/bookrunner/librustdoc",
4946
]
5047

5148
# This indicates what package to e.g. build with 'cargo build' without --workspace

docs/src/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
- [cargo kani assess](./dev-assess.md)
3232
- [Testing](./testing.md)
3333
- [Regression testing](./regression-testing.md)
34-
- [Book runner](./bookrunner.md)
3534
- [(Experimental) Testing with a Large Number of Repositories](./repo-crawl.md)
3635
- [Performance comparisons](./performance-comparisons.md)
3736
- [`benchcomp` command line](./benchcomp-cli.md)

docs/src/bookrunner.md

Lines changed: 0 additions & 81 deletions
This file was deleted.

docs/src/cheat-sheets.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cargo build-dev
1919
### Test
2020

2121
```bash
22-
# Full regression suite (does not run bookrunner)
22+
# Full regression suite
2323
./scripts/kani-regression.sh
2424
```
2525

@@ -39,12 +39,6 @@ rm -r build/x86_64-apple-darwin/tests/
3939
cargo run -p compiletest -- --suite kani --mode kani
4040
```
4141

42-
```bash
43-
# Run bookrunner
44-
./scripts/setup/install_bookrunner_deps.sh
45-
cargo run -p bookrunner
46-
```
47-
4842
```bash
4943
# Build documentation
5044
cd docs

docs/src/testing.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@ two very good reasons to do it:
1515

1616
We recommend reading our section on [Regression
1717
Testing](./regression-testing.md) if you're interested in Kani
18-
development. At present, we obtain metrics based on the [book
19-
runner](./bookrunner.md). To run kani on a large number of remotely
18+
development. To run kani on a large number of remotely
2019
hosted crates, please see [Repository Crawl](./repo-crawl.md).

rustfmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ ignore = [
1515
# For some reason, this is not working without the directory wildcard.
1616
"**/firecracker",
1717
"**/tests/perf/s2n-quic/",
18-
"**/tools/bookrunner/rust-doc/",
1918
]

scripts/build-docs.sh

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,12 @@ else
3232
MDBOOK=${SCRIPT_DIR}/mdbook
3333
fi
3434

35-
# Publish bookrunner report into our documentation
3635
KANI_DIR=$SCRIPT_DIR/..
3736
DOCS_DIR=$KANI_DIR/docs
3837
RFC_DIR=$KANI_DIR/rfc
39-
HTML_DIR=$KANI_DIR/build/output/latest/html/
4038

4139
cd $DOCS_DIR
4240

43-
if [ -d $HTML_DIR ]; then
44-
# Litani run is copied into `src` to avoid deletion by `mdbook`
45-
cp -r $HTML_DIR src/bookrunner/
46-
# Replace artifacts by examples under test
47-
BOOKS_DIR=$KANI_DIR/tests/bookrunner/books
48-
rm -r src/bookrunner/artifacts
49-
# Remove any json files that Kani might've left behind due to crash or timeout.
50-
find $BOOKS_DIR -name '*.json' -exec rm {} \;
51-
find $BOOKS_DIR -name '*.out' -exec rm {} \;
52-
cp -r $BOOKS_DIR src/bookrunner/artifacts
53-
# Update paths in HTML report
54-
python $KANI_DIR/scripts/ci/update_bookrunner_report.py src/bookrunner/index.html new_index.html
55-
mv new_index.html src/bookrunner/index.html
56-
57-
# rm src/bookrunner/run.json
58-
else
59-
echo "WARNING: Could not find the latest bookrunner run."
60-
fi
61-
6241
echo "Building user documentation..."
6342
# Generate benchcomp documentation from source code
6443
mkdir -p gen_src

scripts/ci/bookrunner_failures_by_stage.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)