Skip to content

Commit 1703aa1

Browse files
committed
fix broken unit tests
1 parent 7fa966f commit 1703aa1

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/book/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl MDBook {
237237
.chapter_titles
238238
.extend(preprocess_ctx.chapter_titles.borrow_mut().drain());
239239

240-
debug!("Running the {} backend", renderer.name());
240+
info!("Running the {} backend", renderer.name());
241241
renderer
242242
.render(&render_context)
243243
.with_context(|| "Rendering failed")

src/renderer/html_handlebars/search.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ fn render_item(
206206
body.push_str(&format!(" [{number}] "));
207207
}
208208
Event::TaskListMarker(_checked) => {}
209+
Event::InlineMath(_) | Event::DisplayMath(_) => {}
209210
}
210211
}
211212

src/utils/extern_args.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use std::process::Command;
4141
4242
#[derive(Debug)]
4343
pub struct ExternArgs {
44-
edition: String,
44+
edition: String, // where default value of "" means arg wasn't specified
4545
crate_name: String,
4646
lib_list: Vec<String>,
4747
extern_list: Vec<String>,
@@ -75,7 +75,7 @@ impl ExternArgs {
7575
self.edition = if let Some(Local(edition)) = package.edition {
7676
my_display_edition(edition)
7777
} else {
78-
"2015".to_owned() // and good luck to you, sir!
78+
"".to_owned() //
7979
};
8080

8181
debug!(
@@ -198,7 +198,11 @@ impl ExternArgs {
198198

199199
/// provide the parsed external args used to invoke rustdoc (--edition, -L and --extern).
200200
pub fn get_args(&self) -> Vec<String> {
201-
let mut ret_val: Vec<String> = vec!["--edition".to_owned(), self.edition.clone()];
201+
let mut ret_val: Vec<String> = vec![];
202+
if self.edition != "" {
203+
ret_val.push("--edition".to_owned());
204+
ret_val.push(self.edition.clone());
205+
};
202206
for i in &self.lib_list {
203207
ret_val.push("-L".to_owned());
204208
ret_val.push(i.clone());
@@ -263,16 +267,15 @@ mod test {
263267
Dirty leptos-book v0.1.0 (/home/bobhy/src/localdep/book): the file `src/lib.rs` has changed (1733758773.052514835s, 10h 32m 29s after last build at 1733720824.458358565s)
264268
Compiling leptos-book v0.1.0 (/home/bobhy/src/localdep/book)
265269
Running `/home/bobhy/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc --crate-name leptos_book --edition=2021 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type cdylib --crate-type rlib --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs)' --check-cfg 'cfg(feature, values("hydrate", "ssr"))' -C metadata=2eec49d479de095c --out-dir /home/bobhy/src/localdep/book/target/debug/deps -C incremental=/home/bobhy/src/localdep/book/target/debug/incremental -L dependency=/home/bobhy/src/localdep/book/target/debug/deps --extern console_error_panic_hook=/home/bobhy/src/localdep/book/target/debug/deps/libconsole_error_panic_hook-d34cf0116774f283.rlib --extern http=/home/bobhy/src/localdep/book/target/debug/deps/libhttp-d4d503240b7a6b18.rlib --extern leptos=/home/bobhy/src/localdep/book/target/debug/deps/libleptos-1dabf2e09ca58f3d.rlib --extern leptos_meta=/home/bobhy/src/localdep/book/target/debug/deps/libleptos_meta-df8ce1704acca063.rlib --extern leptos_router=/home/bobhy/src/localdep/book/target/debug/deps/libleptos_router-df109cd2ee44b2a0.rlib --extern mdbook_keeper_lib=/home/bobhy/src/localdep/book/target/debug/deps/libmdbook_keeper_lib-f4016aaf2c5da5f2.rlib --extern thiserror=/home/bobhy/src/localdep/book/target/debug/deps/libthiserror-acc5435cdf9551fe.rlib --extern wasm_bindgen=/home/bobhy/src/localdep/book/target/debug/deps/libwasm_bindgen-89a7b1dccd9668ae.rlib`
266-
Running `/home/bobhy/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc --crate-name leptos_book --edition=2021 src/main.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type bin --emit=dep-info,link -C embed-bitcode=no -C debuginfo=2 --check-cfg 'cfg(docsrs)' --check-cfg 'cfg(feature, values("hydrate", "ssr"))' -C metadata=24fbc99376c5eff3 -C extra-filename=-24fbc99376c5eff3 --out-dir /home/bobhy/src/localdep/book/target/debug/deps -C incremental=/home/bobhy/src/localdep/book/target/debug/incremental -L dependency=/home/bobhy/src/localdep/book/target/debug/deps --extern console_error_panic_hook=/home/bobhy/src/localdep/book/target/debug/deps/libconsole_error_panic_hook-d34cf0116774f283.rlib --extern http=/home/bobhy/src/localdep/book/target/debug/deps/libhttp-d4d503240b7a6b18.rlib --extern leptos=/home/bobhy/src/localdep/book/target/debug/deps/libleptos-1dabf2e09ca58f3d.rlib --extern leptos_book=/home/bobhy/src/localdep/book/target/debug/deps/libleptos_book.rlib --extern leptos_meta=/home/bobhy/src/localdep/book/target/debug/deps/libleptos_meta-df8ce1704acca063.rlib --extern leptos_router=/home/bobhy/src/localdep/book/target/debug/deps/libleptos_router-df109cd2ee44b2a0.rlib --extern mdbook_keeper_lib=/home/bobhy/src/localdep/book/target/debug/deps/libmdbook_keeper_lib-f4016aaf2c5da5f2.rlib --extern thiserror=/home/bobhy/src/localdep/book/target/debug/deps/libthiserror-acc5435cdf9551fe.rlib --extern wasm_bindgen=/home/bobhy/src/localdep/book/target/debug/deps/libwasm_bindgen-89a7b1dccd9668ae.rlib`
267270
Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.60s
268271
269272
"###;
270273

271274
let mut ea = ExternArgs::new();
272-
ea.parse_response(&test_str, "leptos_book")?;
275+
ea.parse_response("leptos_book", &test_str)?;
273276

274277
let args = ea.get_args();
275-
assert_eq!(18, args.len());
278+
assert_eq!(20, args.len());
276279

277280
assert_eq!(1, args.iter().filter(|i| *i == "-L").count());
278281
assert_eq!(8, args.iter().filter(|i| *i == "--extern").count());

0 commit comments

Comments
 (0)