Don't use nightly rust
This commit is contained in:
parent
632fa4aa73
commit
d5d10a4818
@ -1,6 +1,6 @@
|
|||||||
use std::{
|
use std::{
|
||||||
cell::RefCell,
|
cell::RefCell,
|
||||||
fs::{File, ReadDir},
|
fs::{DirEntry, File, ReadDir},
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
rc::Rc,
|
rc::Rc,
|
||||||
};
|
};
|
||||||
@ -107,10 +107,7 @@ impl Iterator for ReadFilesRecursive {
|
|||||||
} else {
|
} else {
|
||||||
match self.read_dir.next() {
|
match self.read_dir.next() {
|
||||||
Some(Ok(ent)) => {
|
Some(Ok(ent)) => {
|
||||||
if let Ok(ft) = ent.file_type()
|
if let Some(recurse) = read_files_recursive_ent(&ent) {
|
||||||
&& ft.is_dir()
|
|
||||||
&& let Ok(recurse) = read_files_recursive(ent.path())
|
|
||||||
{
|
|
||||||
self.recurse = Some(Box::new(recurse));
|
self.recurse = Some(Box::new(recurse));
|
||||||
self.next()
|
self.next()
|
||||||
} else {
|
} else {
|
||||||
@ -123,6 +120,16 @@ impl Iterator for ReadFilesRecursive {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn read_files_recursive_ent(ent: &DirEntry) -> Option<ReadFilesRecursive> {
|
||||||
|
let Ok(ft) = ent.file_type() else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
if !ft.is_dir() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
read_files_recursive(ent.path()).ok()
|
||||||
|
}
|
||||||
|
|
||||||
fn read_files_recursive(path: PathBuf) -> std::io::Result<ReadFilesRecursive> {
|
fn read_files_recursive(path: PathBuf) -> std::io::Result<ReadFilesRecursive> {
|
||||||
std::fs::read_dir(path).map(|read_dir| ReadFilesRecursive {
|
std::fs::read_dir(path).map(|read_dir| ReadFilesRecursive {
|
||||||
read_dir,
|
read_dir,
|
||||||
|
@ -123,13 +123,16 @@ impl Rule for PostsByTag {
|
|||||||
.inputs
|
.inputs
|
||||||
.iter()
|
.iter()
|
||||||
.flat_map(|post_input| {
|
.flat_map(|post_input| {
|
||||||
if let Some(post) = post_input.value().as_ref()
|
let post = post_input.value();
|
||||||
&& post
|
let Some(post) = post.as_ref() else {
|
||||||
.metadata
|
return None;
|
||||||
.tags
|
};
|
||||||
.iter()
|
if post
|
||||||
.flatten()
|
.metadata
|
||||||
.any(|t| t.slug == self.tag.slug)
|
.tags
|
||||||
|
.iter()
|
||||||
|
.flatten()
|
||||||
|
.any(|t| t.slug == self.tag.slug)
|
||||||
{
|
{
|
||||||
Some(Entry {
|
Some(Entry {
|
||||||
permalink: post.permalink(),
|
permalink: post.permalink(),
|
||||||
|
@ -42,7 +42,8 @@ impl<I: Iterator<Item = char>> Iterator for Slugify<I> {
|
|||||||
// if we're about to start lowercasing something, and the previous
|
// if we're about to start lowercasing something, and the previous
|
||||||
// (untransformed) char was lowercase (i.e., at a transition from lower ->
|
// (untransformed) char was lowercase (i.e., at a transition from lower ->
|
||||||
// upper case), emit a substitution
|
// upper case), emit a substitution
|
||||||
if let Action::Lowercase = action && let Some(prev_char) = prev_char && prev_char.is_lowercase() {
|
if action == Action::Lowercase && prev_char.map_or(false, |c| c.is_lowercase())
|
||||||
|
{
|
||||||
self.state = State::Lowercase(c.to_lowercase());
|
self.state = State::Lowercase(c.to_lowercase());
|
||||||
Some(self.substitution)
|
Some(self.substitution)
|
||||||
} else {
|
} else {
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
#![feature(let_chains)]
|
|
||||||
|
|
||||||
mod generator;
|
mod generator;
|
||||||
mod live_reload;
|
mod live_reload;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user