actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2263 from jhult/theme-dir-warning-check 

Remove warning check for theme directory as ./src/theme
This commit is contained in:
Dylan DPC 2023-12-10 08:33:10 +00:00 committed by GitHub
parent b7f46213c7 91af1c3b54
commit c1d622e56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/renderer/html_handlebars/hbs_renderer.rs
View File

@ -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 { impl Renderer for HtmlHandlebars {
fn name(&self) -> &str { fn name(&self) -> &str {
"html" "html"
@ -529,16 +510,6 @@ impl Renderer for HtmlHandlebars {
None => ctx.root.join("theme"), 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); let theme = theme::Theme::new(theme_dir);
debug!("Register the index handlebars template"); debug!("Register the index handlebars template");