aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--.github/workflows/publish.yml1
-rw-r--r--CHANGELOG.md1
-rw-r--r--Cargo.lock49
-rw-r--r--Cargo.toml4
-rw-r--r--Dockerfile1
-rw-r--r--Dockerfile.alpine1
-rw-r--r--README.md2
-rw-r--r--rust-toolchain1
-rw-r--r--src/main.rs2
10 files changed, 35 insertions, 29 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7dab67a..0f39ae6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
- rust: [nightly]
+ rust: [stable, nightly]
steps:
- name: Checkout code
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8b98ece..ee84f44 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -63,7 +63,6 @@ jobs:
- name: Setup Rust toolchain
uses: actions-rs/toolchain@v1
with:
- toolchain: nightly-2020-09-22
target: ${{ matrix.target }}
override: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31297f9..d9d7628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
<!-- next-header -->
## [Unreleased] - ReleaseDate
+- Now compiles on stable! :D
## [0.10.0] - 2020-10-02
- Add embedded favicon [#364](https://github.com/svenstaro/miniserve/issues/364)
diff --git a/Cargo.lock b/Cargo.lock
index f9e2806..16dee48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -464,9 +464,9 @@ dependencies = [
[[package]]
name = "base-x"
-version = "0.2.6"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
+checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
[[package]]
name = "base64"
@@ -610,9 +610,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.61"
+version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d"
+checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
[[package]]
name = "cfg-if"
@@ -695,9 +695,9 @@ checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
[[package]]
name = "cookie"
-version = "0.14.2"
+version = "0.14.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
+checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f"
dependencies = [
"percent-encoding",
"time 0.2.22",
@@ -841,11 +841,11 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.12"
+version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"libc",
"redox_syscall",
"winapi 0.3.9",
@@ -879,6 +879,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
+name = "form_urlencoded"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
+dependencies = [
+ "matches",
+ "percent-encoding",
+]
+
+[[package]]
name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1668,9 +1678,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "num-bigint"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f3fc75e3697059fb1bc465e3d8cca6cf92f56854f201158b3f9c77d5a3cfa0"
+checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
dependencies = [
"autocfg 1.0.1",
"num-integer",
@@ -1689,9 +1699,9 @@ dependencies = [
[[package]]
name = "num-rational"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5fa6d5f418879385b213d905f7cf5bf4aa553d4c380f0152d1d4f2749186fa9"
+checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
dependencies = [
"autocfg 1.0.1",
"num-bigint",
@@ -2729,18 +2739,18 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
dependencies = [
"proc-macro2",
"quote",
@@ -3047,10 +3057,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "url"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
dependencies = [
+ "form_urlencoded",
"idna",
"matches",
"percent-encoding",
diff --git a/Cargo.toml b/Cargo.toml
index d977e83..6ab91a4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ alphanumeric-sort = "1.4.0"
structopt = "0.3"
chrono = "0.4.19"
chrono-humanize = "0.1.1"
-maud = { version = "0.22.0", features = ["actix-web"] }
+maud = { version = "0.22.1", features = ["actix-web"] }
serde = { version = "1.0.117", features = ["derive"] }
tar = "0.4.30"
futures = "0.3.7"
@@ -54,7 +54,7 @@ select = "0.5"
rstest = "0.6"
regex = "1.4.2"
pretty_assertions = "0.6"
-url = "2.1"
+url = "2.2"
[build-dependencies]
grass = "0.10.3"
diff --git a/Dockerfile b/Dockerfile
index 70a8ff8..6fb6d10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ FROM rust as builder
ENV APP_HOME /usr/src/app/
-RUN rustup default nightly-2020-09-22
RUN rustup target add x86_64-unknown-linux-musl
RUN apt update && apt-get install -y upx musl-tools
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index dc6d918..f99d757 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -4,7 +4,6 @@ FROM rust as builder
ENV APP_HOME /usr/src/app/
-RUN rustup default nightly-2020-09-22
RUN rustup target add x86_64-unknown-linux-musl
RUN apt update && apt-get install -y upx musl-tools
diff --git a/README.md b/README.md
index 1985a52..2ebc6f0 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ Alternatively install with [Homebrew](https://brew.sh/).
miniserve-win.exe
-**With Cargo**: You will need the _nightly_ version of Rust to compile the project. Then you can run
+**With Cargo**: Make sure you have a recent version of Rust. Then you can run
cargo install miniserve
miniserve
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index f17fd00..0000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2020-09-22
diff --git a/src/main.rs b/src/main.rs
index c70bd3b..04a9cae 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,3 @@
-#![feature(proc_macro_hygiene)]
-
use actix_web::web;
use actix_web::{
http::{header::ContentType, StatusCode},
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 19:59:49 +0000