Skip to content

Commit

Permalink
Merge pull request #2263 from jhult/theme-dir-warning-check
Browse files Browse the repository at this point in the history
Remove warning check for theme directory as ./src/theme
  • Loading branch information
Dylan-DPC authored Dec 10, 2023
2 parents b7f4621 + 91af1c3 commit c1d622e
Showing 1 changed file with 0 additions and 29 deletions.
29 changes: 0 additions & 29 deletions src/renderer/html_handlebars/hbs_renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -478,25 +478,6 @@ impl HtmlHandlebars {
}
}

// TODO(mattico): Remove some time after the 0.1.8 release
fn maybe_wrong_theme_dir(dir: &Path) -> Result<bool> {
fn entry_is_maybe_book_file(entry: fs::DirEntry) -> Result<bool> {
Ok(entry.file_type()?.is_file()
&& entry.path().extension().map_or(false, |ext| ext == "md"))
}

if dir.is_dir() {
for entry in fs::read_dir(dir)? {
if entry_is_maybe_book_file(entry?).unwrap_or(false) {
return Ok(false);
}
}
Ok(true)
} else {
Ok(false)
}
}

impl Renderer for HtmlHandlebars {
fn name(&self) -> &str {
"html"
Expand Down Expand Up @@ -529,16 +510,6 @@ impl Renderer for HtmlHandlebars {
None => ctx.root.join("theme"),
};

if html_config.theme.is_none()
&& maybe_wrong_theme_dir(&src_dir.join("theme")).unwrap_or(false)
{
warn!(
"Previous versions of mdBook erroneously accepted `./src/theme` as an automatic \
theme directory"
);
warn!("Please move your theme files to `./theme` for them to continue being used");
}

let theme = theme::Theme::new(theme_dir);

debug!("Register the index handlebars template");
Expand Down

0 comments on commit c1d622e

Please sign in to comment.