Skip to content

Commit ceb26e5

Browse files
authored
Merge branch 'master' into patch-2
2 parents a132734 + 98abb22 commit ceb26e5

Some content is hidden

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

89 files changed

+4305
-1680
lines changed

.github/workflows/deploy.yml

+9-13
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,25 @@ permissions:
1212

1313
jobs:
1414
release:
15-
name: Deploy Release
1615
runs-on: ${{ matrix.os }}
1716
strategy:
1817
matrix:
19-
target:
20-
- aarch64-unknown-linux-musl
21-
- x86_64-unknown-linux-gnu
22-
- x86_64-unknown-linux-musl
23-
- x86_64-apple-darwin
24-
- x86_64-pc-windows-msvc
2518
include:
2619
- target: aarch64-unknown-linux-musl
27-
os: ubuntu-20.04
20+
os: ubuntu-22.04
2821
- target: x86_64-unknown-linux-gnu
29-
os: ubuntu-20.04
22+
os: ubuntu-22.04
3023
- target: x86_64-unknown-linux-musl
31-
os: ubuntu-20.04
24+
os: ubuntu-22.04
3225
- target: x86_64-apple-darwin
3326
os: macos-latest
27+
- target: aarch64-apple-darwin
28+
os: macos-latest
3429
- target: x86_64-pc-windows-msvc
3530
os: windows-latest
31+
name: Deploy ${{ matrix.target }}
3632
steps:
37-
- uses: actions/checkout@master
33+
- uses: actions/checkout@v4
3834
- name: Install Rust
3935
run: ci/install-rust.sh stable ${{ matrix.target }}
4036
- name: Build asset
@@ -47,7 +43,7 @@ jobs:
4743
name: GitHub Pages
4844
runs-on: ubuntu-latest
4945
steps:
50-
- uses: actions/checkout@master
46+
- uses: actions/checkout@v4
5147
- name: Install Rust (rustup)
5248
run: rustup update stable --no-self-update && rustup default stable
5349
- name: Build book
@@ -64,7 +60,7 @@ jobs:
6460
name: Publish to crates.io
6561
runs-on: ubuntu-latest
6662
steps:
67-
- uses: actions/checkout@master
63+
- uses: actions/checkout@v4
6864
- name: Install Rust (rustup)
6965
run: rustup update stable --no-self-update && rustup default stable
7066
- name: Publish

.github/workflows/main.yml

+56-15
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,92 @@ on:
33
pull_request:
44
merge_group:
55

6+
env:
7+
BROWSER_UI_TEST_VERSION: '0.19.0'
8+
69
jobs:
710
test:
8-
name: Test
911
runs-on: ${{ matrix.os }}
1012
strategy:
1113
matrix:
12-
build: [stable, beta, nightly, macos, windows, msrv]
1314
include:
14-
- build: stable
15+
- name: stable linux
1516
os: ubuntu-latest
1617
rust: stable
17-
- build: beta
18+
target: x86_64-unknown-linux-gnu
19+
- name: beta linux
1820
os: ubuntu-latest
1921
rust: beta
20-
- build: nightly
22+
target: x86_64-unknown-linux-gnu
23+
- name: nightly linux
2124
os: ubuntu-latest
2225
rust: nightly
23-
- build: macos
26+
target: x86_64-unknown-linux-gnu
27+
- name: stable x86_64-unknown-linux-musl
28+
os: ubuntu-22.04
29+
rust: stable
30+
target: x86_64-unknown-linux-musl
31+
- name: stable x86_64 macos
2432
os: macos-latest
2533
rust: stable
26-
- build: windows
34+
target: x86_64-apple-darwin
35+
- name: stable aarch64 macos
36+
os: macos-latest
37+
rust: stable
38+
target: aarch64-apple-darwin
39+
- name: stable windows-msvc
2740
os: windows-latest
2841
rust: stable
29-
- build: msrv
30-
os: ubuntu-20.04
42+
target: x86_64-pc-windows-msvc
43+
- name: msrv
44+
os: ubuntu-22.04
3145
# sync MSRV with docs: guide/src/guide/installation.md and Cargo.toml
32-
rust: 1.66.0
46+
rust: 1.77.0
47+
target: x86_64-unknown-linux-gnu
48+
name: ${{ matrix.name }}
3349
steps:
34-
- uses: actions/checkout@v3
50+
- uses: actions/checkout@v4
3551
- name: Install Rust
36-
run: bash ci/install-rust.sh ${{ matrix.rust }}
52+
run: bash ci/install-rust.sh ${{ matrix.rust }} ${{ matrix.target }}
3753
- name: Build and run tests
38-
run: cargo test --locked
54+
run: cargo test --locked --target ${{ matrix.target }}
3955
- name: Test no default
40-
run: cargo test --no-default-features
56+
run: cargo test --no-default-features --target ${{ matrix.target }}
57+
58+
aarch64-cross-builds:
59+
runs-on: ubuntu-22.04
60+
steps:
61+
- uses: actions/checkout@v4
62+
- name: Install Rust
63+
run: bash ci/install-rust.sh stable aarch64-unknown-linux-musl
64+
- name: Build
65+
run: cargo build --locked --target aarch64-unknown-linux-musl
4166

4267
rustfmt:
4368
name: Rustfmt
4469
runs-on: ubuntu-latest
4570
steps:
46-
- uses: actions/checkout@v3
71+
- uses: actions/checkout@v4
4772
- name: Install Rust
4873
run: rustup update stable && rustup default stable && rustup component add rustfmt
4974
- run: cargo fmt --check
5075

76+
gui:
77+
name: GUI tests
78+
runs-on: ubuntu-latest
79+
steps:
80+
- uses: actions/checkout@v4
81+
- name: Install Rust
82+
run: bash ci/install-rust.sh stable x86_64-unknown-linux-gnu
83+
- name: Install npm
84+
uses: actions/setup-node@v3
85+
with:
86+
node-version: 20
87+
- name: Install browser-ui-test
88+
run: npm install browser-ui-test@"${BROWSER_UI_TEST_VERSION}"
89+
- name: Build and run tests (+ GUI)
90+
run: cargo test --locked --target x86_64-unknown-linux-gnu --test gui
91+
5192
# The success job is here to consolidate the total success/failure state of
5293
# all other jobs. This job is then included in the GitHub branch protection
5394
# rule which prevents merges unless all other jobs are passing. This makes

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@ test_book/book/
1616
# Ignore Vim temporary and swap files.
1717
*.sw?
1818
*~
19+
20+
# GUI tests
21+
node_modules
22+
package-lock.json
23+
package.json

CHANGELOG.md

+195
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,200 @@
11
# Changelog
22

3+
## mdBook 0.4.45
4+
[v0.4.44...v0.4.45](https://github.com/rust-lang/mdBook/compare/v0.4.44...v0.4.45)
5+
6+
### Changed
7+
8+
- Added context to error message when rustdoc is not found.
9+
[#2545](https://github.com/rust-lang/mdBook/pull/2545)
10+
- Slightly changed the styling rules around margins of footnotes.
11+
[#2524](https://github.com/rust-lang/mdBook/pull/2524)
12+
13+
### Fixed
14+
15+
- Fixed an issue where it would panic if a source_path is not set.
16+
[#2550](https://github.com/rust-lang/mdBook/pull/2550)
17+
18+
## mdBook 0.4.44
19+
[v0.4.43...v0.4.44](https://github.com/rust-lang/mdBook/compare/v0.4.43...v0.4.44)
20+
21+
### Added
22+
23+
- Added pre-built aarch64-apple-darwin binaries to the releases.
24+
[#2500](https://github.com/rust-lang/mdBook/pull/2500)
25+
- `mdbook clean` now shows a summary of what it did.
26+
[#2458](https://github.com/rust-lang/mdBook/pull/2458)
27+
- Added the `output.html.search.chapter` config setting to disable search indexing of individual chapters.
28+
[#2533](https://github.com/rust-lang/mdBook/pull/2533)
29+
30+
### Fixed
31+
32+
- Fixed auto-scrolling the side-bar when loading a page with a `#` fragment URL.
33+
[#2517](https://github.com/rust-lang/mdBook/pull/2517)
34+
- Fixed display of sidebar when javascript is disabled.
35+
[#2529](https://github.com/rust-lang/mdBook/pull/2529)
36+
- Fixed the sidebar visibility getting out of sync with the button.
37+
[#2532](https://github.com/rust-lang/mdBook/pull/2532)
38+
39+
### Changed
40+
41+
- ❗ Rust code block hidden lines now follow the same logic as rustdoc. This requires a space after the `#` symbol.
42+
[#2530](https://github.com/rust-lang/mdBook/pull/2530)
43+
- ❗ Updated the Linux pre-built binaries which requires a newer version of glibc (2.34).
44+
[#2523](https://github.com/rust-lang/mdBook/pull/2523)
45+
- Updated dependencies
46+
[#2538](https://github.com/rust-lang/mdBook/pull/2538)
47+
[#2539](https://github.com/rust-lang/mdBook/pull/2539)
48+
49+
## mdBook 0.4.43
50+
[v0.4.42...v0.4.43](https://github.com/rust-lang/mdBook/compare/v0.4.42...v0.4.43)
51+
52+
### Fixed
53+
54+
- Fixed setting the title in `mdbook init` when no git user is configured.
55+
[#2486](https://github.com/rust-lang/mdBook/pull/2486)
56+
57+
### Changed
58+
59+
- The Rust 2024 edition no longer needs `-Zunstable-options`.
60+
[#2495](https://github.com/rust-lang/mdBook/pull/2495)
61+
62+
## mdBook 0.4.42
63+
[v0.4.41...v0.4.42](https://github.com/rust-lang/mdBook/compare/v0.4.41...v0.4.42)
64+
65+
### Fixed
66+
67+
- Fixed chapter list folding.
68+
[#2473](https://github.com/rust-lang/mdBook/pull/2473)
69+
70+
## mdBook 0.4.41
71+
[v0.4.40...v0.4.41](https://github.com/rust-lang/mdBook/compare/v0.4.40...v0.4.41)
72+
73+
**Note:** If you have a custom `index.hbs` theme file, you will need to update it to the latest version.
74+
75+
### Added
76+
77+
- Added preliminary support for Rust 2024 edition.
78+
[#2398](https://github.com/rust-lang/mdBook/pull/2398)
79+
- Added a full example of the remove-emphasis preprocessor.
80+
[#2464](https://github.com/rust-lang/mdBook/pull/2464)
81+
82+
### Changed
83+
84+
- Adjusted styling of clipboard/play icons.
85+
[#2421](https://github.com/rust-lang/mdBook/pull/2421)
86+
- Updated to handlebars v6.
87+
[#2416](https://github.com/rust-lang/mdBook/pull/2416)
88+
- Attr and section rules now have specific code highlighting.
89+
[#2448](https://github.com/rust-lang/mdBook/pull/2448)
90+
- The sidebar is now loaded from a common file, significantly reducing the book size when there are many chapters.
91+
[#2414](https://github.com/rust-lang/mdBook/pull/2414)
92+
- Updated dependencies.
93+
[#2470](https://github.com/rust-lang/mdBook/pull/2470)
94+
95+
### Fixed
96+
97+
- Improved theme support when JavaScript is disabled.
98+
[#2454](https://github.com/rust-lang/mdBook/pull/2454)
99+
- Fixed broken themes when localStorage has an invalid theme id.
100+
[#2463](https://github.com/rust-lang/mdBook/pull/2463)
101+
- Adjusted the line-height of superscripts (and footnotes) to avoid adding extra space between lines.
102+
[#2465](https://github.com/rust-lang/mdBook/pull/2465)
103+
104+
## mdBook 0.4.40
105+
[v0.4.39...v0.4.40](https://github.com/rust-lang/mdBook/compare/v0.4.39...v0.4.40)
106+
107+
### Fixed
108+
109+
- Reverted the update to pulldown-cmark which broke the semver API.
110+
[#2388](https://github.com/rust-lang/mdBook/pull/2388)
111+
112+
## mdBook 0.4.39
113+
[v0.4.38...v0.4.39](https://github.com/rust-lang/mdBook/compare/v0.4.38...v0.4.39)
114+
115+
### Fixed
116+
117+
- Fixed the automatic deploy broken in the previous release.
118+
[#2383](https://github.com/rust-lang/mdBook/pull/2383)
119+
120+
## mdBook 0.4.38
121+
[v0.4.37...v0.4.38](https://github.com/rust-lang/mdBook/compare/v0.4.37...v0.4.38)
122+
123+
### Added
124+
125+
- Added `nix` to the default set of languages supported for syntax highlighting.
126+
[#2262](https://github.com/rust-lang/mdBook/pull/2262)
127+
128+
### Changed
129+
130+
- The `output.html.curly-quotes` option has been renamed to `output.html.smart-punctuation` to better reflect what it does. The old option `curly-quotes` is kept for compatibility, but may be removed in the future.
131+
[#2327](https://github.com/rust-lang/mdBook/pull/2327)
132+
- The file-watcher used in `mdbook serve` and `mdbook watch` now uses a poll-based watcher instead of the native operating system notifications. This should fix issues on various systems and environments, and more accurately detect when files change. The native watcher can still be used with the `--watcher native` CLI option.
133+
[#2325](https://github.com/rust-lang/mdBook/pull/2325)
134+
- `mdbook test` output now includes color, and shows relative paths to the source.
135+
[#2259](https://github.com/rust-lang/mdBook/pull/2259)
136+
- Updated dependencies, MSRV raised to 1.74
137+
[#2350](https://github.com/rust-lang/mdBook/pull/2350)
138+
[#2351](https://github.com/rust-lang/mdBook/pull/2351)
139+
[#2378](https://github.com/rust-lang/mdBook/pull/2378)
140+
[#2381](https://github.com/rust-lang/mdBook/pull/2381)
141+
142+
### Fixed
143+
144+
- Reduced memory allocation when copying files.
145+
[#2355](https://github.com/rust-lang/mdBook/pull/2355)
146+
- Fixed the horizontal divider in `SUMMARY.md` from being indented into the previous nested section.
147+
[#2364](https://github.com/rust-lang/mdBook/pull/2364)
148+
- Removed unnecessary `@import` in the CSS.
149+
[#2260](https://github.com/rust-lang/mdBook/pull/2260)
150+
151+
## mdBook 0.4.37
152+
[v0.4.36...v0.4.37](https://github.com/rust-lang/mdBook/compare/v0.4.36...v0.4.37)
153+
154+
### Changed
155+
- ❗️ Updated the markdown parser. This brings in many changes to more closely follow the CommonMark spec. This may cause some small rendering changes. It is recommended to compare the output of the old and new version to check for changes. See <https://github.com/raphlinus/pulldown-cmark/releases/tag/v0.10.0> for more information.
156+
[#2308](https://github.com/rust-lang/mdBook/pull/2308)
157+
- The warning about the legacy `src/theme` directory has been removed.
158+
[#2263](https://github.com/rust-lang/mdBook/pull/2263)
159+
- Updated dependencies. MSRV raised to 1.71.0.
160+
[#2283](https://github.com/rust-lang/mdBook/pull/2283)
161+
[#2293](https://github.com/rust-lang/mdBook/pull/2293)
162+
[#2297](https://github.com/rust-lang/mdBook/pull/2297)
163+
[#2310](https://github.com/rust-lang/mdBook/pull/2310)
164+
[#2309](https://github.com/rust-lang/mdBook/pull/2309)
165+
- Some internal performance/memory improvements.
166+
[#2273](https://github.com/rust-lang/mdBook/pull/2273)
167+
[#2290](https://github.com/rust-lang/mdBook/pull/2290)
168+
- Made the `pathdiff` dependency optional based on the `watch` feature.
169+
[#2291](https://github.com/rust-lang/mdBook/pull/2291)
170+
171+
### Fixed
172+
- The `s` shortcut key handler should not trigger when focus is in an HTML form.
173+
[#2311](https://github.com/rust-lang/mdBook/pull/2311)
174+
175+
## mdBook 0.4.36
176+
[v0.4.35...v0.4.36](https://github.com/rust-lang/mdBook/compare/v0.4.35...v0.4.36)
177+
178+
### Added
179+
- Added Nim to the default highlighted languages.
180+
[#2232](https://github.com/rust-lang/mdBook/pull/2232)
181+
- Added a small indicator for the sidebar resize handle.
182+
[#2209](https://github.com/rust-lang/mdBook/pull/2209)
183+
184+
### Changed
185+
- Updated dependencies. MSRV raised to 1.70.0.
186+
[#2173](https://github.com/rust-lang/mdBook/pull/2173)
187+
[#2250](https://github.com/rust-lang/mdBook/pull/2250)
188+
[#2252](https://github.com/rust-lang/mdBook/pull/2252)
189+
190+
### Fixed
191+
- Fixed blank column in print page when the sidebar was visible.
192+
[#2235](https://github.com/rust-lang/mdBook/pull/2235)
193+
- Fixed indentation of code blocks when Javascript is disabled.
194+
[#2162](https://github.com/rust-lang/mdBook/pull/2162)
195+
- Fixed a panic when `mdbook serve` or `mdbook watch` were given certain kinds of paths.
196+
[#2229](https://github.com/rust-lang/mdBook/pull/2229)
197+
3198
## mdBook 0.4.35
4199
[v0.4.34...v0.4.35](https://github.com/rust-lang/mdBook/compare/v0.4.34...v0.4.35)
5200

0 commit comments

Comments
 (0)