Switch to stable toolchain

This commit is contained in:
Zoey 2021-08-19 13:59:00 -07:00
parent 41268039de
commit e91bbc38c5
5 changed files with 31 additions and 45 deletions

View file

@ -27,12 +27,6 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
# Runs a single command using the runners shell # Runs a single command using the runners shell
- name: Build site - name: Build site
run: | run: |

2
rust-toolchain.toml Normal file
View file

@ -0,0 +1,2 @@
[toolchain]
channel = "stable"

View file

@ -57,9 +57,7 @@ impl<'a> SiteBuilder<'a> {
/// Prepares the site builder for use. /// Prepares the site builder for use.
pub fn prepare(mut self) -> anyhow::Result<Self> { pub fn prepare(mut self) -> anyhow::Result<Self> {
let build_static_path = self.build_path.join(STATIC_PATH); let build_static_path = self.build_path.join(STATIC_PATH);
if std::fs::try_exists(&self.build_path) if self.build_path.exists() {
.context("Failed check if build directory exists")?
{
if build_static_path.exists() { if build_static_path.exists() {
std::fs::remove_dir_all(&build_static_path) std::fs::remove_dir_all(&build_static_path)
.context("Failed to remove old static directory")?; .context("Failed to remove old static directory")?;

View file

@ -1,6 +1,3 @@
#![feature(path_try_exists)]
#![feature(async_closure)]
mod builder; mod builder;
#[cfg(feature = "serve")] #[cfg(feature = "serve")]
pub mod serving; pub mod serving;

View file

@ -231,16 +231,12 @@ impl Site {
.or(warp::any().and(warp::get()).and( .or(warp::any().and(warp::get()).and(
warp::path::full() warp::path::full()
.and(with_build_path(build_path.clone())) .and(with_build_path(build_path.clone()))
.and_then( .and_then(move |path: FullPath, build_path: PathBuf| async move {
async move |path: FullPath,
build_path: PathBuf|
-> Result<Response, warp::Rejection> {
// Serve static files // Serve static files
let p = &path.as_str()[1..]; let p = &path.as_str()[1..];
if p == "static/_dev.js" { if p == "static/_dev.js" {
let res = let res = Response::new(include_str!("./refresh_websocket.js").into());
Response::new(include_str!("./refresh_websocket.js").into());
return Ok(res); return Ok(res);
} }
@ -268,8 +264,7 @@ impl Site {
return Ok(res); return Ok(res);
} }
Err(warp::reject()) Err(warp::reject())
}, }),
),
)) ))
.or(warp::any() .or(warp::any()
.and(warp::path::full()) .and(warp::path::full())