Skip to content

Commit 3f3c852

Browse files
committed
Auto merge of #12000 - weihanglo:exclude-cleanup, r=epage
Remove `src/doc` from `exclude` list in Cargo.toml
2 parents c3e3d90 + 8966ab0 commit 3f3c852

File tree

5 files changed

+15
-11
lines changed

5 files changed

+15
-11
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ jobs:
185185
- run: rustup component add rust-docs
186186
- run: ci/validate-man.sh
187187
# This requires rustfmt, use stable.
188-
- run: cd src/doc/semver-check && cargo +stable run
188+
- name: Run semver-check
189+
run: cargo +stable run -p semver-check
189190
- run: |
190191
mkdir mdbook
191192
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.27/mdbook-v0.4.27-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
@@ -195,11 +196,11 @@ jobs:
195196
env:
196197
RUSTDOCFLAGS: -D warnings
197198
- run: cd src/doc && mdbook build --dest-dir ../../target/doc
198-
- run: |
199-
cd src/doc
200-
curl -sSLo linkcheck.sh \
201-
https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
202-
sh linkcheck.sh --all cargo
199+
- name: Run linkchecker.sh
200+
run: |
201+
cd target
202+
curl -sSLO https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
203+
sh linkcheck.sh --all --path ../src/doc cargo
203204
204205
success:
205206
permissions:

Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ members = [
77
"benches/capture",
88
]
99
exclude = [
10-
# For linkchecker (downloaded during CI) and semver-check
11-
# TODO: Either move semver-check to crates/ folder,
12-
# or make linkchecker run from a given directory.
13-
"src/doc/",
1410
"target/", # exclude bench testing
1511
]
1612

File renamed without changes.

src/doc/semver-check/src/main.rs renamed to crates/semver-check/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const SEPARATOR: &str = "///////////////////////////////////////////////////////
2525
fn doit() -> Result<(), Box<dyn Error>> {
2626
let filename = std::env::args()
2727
.nth(1)
28-
.unwrap_or_else(|| "../src/reference/semver.md".to_string());
28+
.unwrap_or_else(|| "src/doc/src/reference/semver.md".to_string());
2929
let contents = fs::read_to_string(filename)?;
3030
let mut lines = contents.lines().enumerate();
3131

0 commit comments

Comments
 (0)