diff --git a/.github/workflows/premerge.yml b/.github/workflows/premerge.yml index 9c94f40..3532b6b 100644 --- a/.github/workflows/premerge.yml +++ b/.github/workflows/premerge.yml @@ -18,7 +18,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2020-09-27 + toolchain: stable override: true - name: Build check @@ -41,7 +41,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2020-09-27 + toolchain: stable default: true components: rustfmt, clippy diff --git a/Cargo.lock b/Cargo.lock index eb6c1b5..fe73885 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -688,9 +688,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "maud" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84613702fc079d2e22a2d39b9a1b80a8da9e82b13fb5fe7abcd488928ea75fdb" +checksum = "6e36db0dfb7837b5d45f9377ebb876b9626c9f5c69b0967ff843b1cc663e1779" dependencies = [ "maud_htmlescape", "maud_macros", @@ -704,12 +704,14 @@ checksum = "d0fb85bccffc42302ad1e1ed8679f6a39d1317f775a37fbc3f79bdfbe054bfb7" [[package]] name = "maud_macros" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb626dcc05fdacb1796b5efae3ea50ca1213713925093e2febb7d33ba5c9bcd" +checksum = "9c8a69150dcdec0789832ee54a70170866a4492ff3af571420dbc3a984970c07" dependencies = [ - "matches", "maud_htmlescape", + "proc-macro-error", + "proc-macro2", + "quote", "syn", ] @@ -970,6 +972,30 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.18" diff --git a/Cargo.toml b/Cargo.toml index 5131b51..96a825e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ futures = "0.3" hyper = "0.13" indexmap = { version = "1", features = ["serde-1"] } lru_time_cache = "0.11.1" -maud = "0.22" +maud = "0.22.1" once_cell = "1.4" pin-project = "0.4" relative-path = { version = "1.3", features = ["serde"] } diff --git a/Dockerfile b/Dockerfile index c5e690f..97e8177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,4 @@ -FROM buildpack-deps:buster as build - -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH - -COPY rust-toolchain /src/ - -RUN set -eux; \ - \ - url="https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init"; \ - wget "$url"; \ - chmod +x rustup-init; \ - ./rustup-init -y --no-modify-path --default-toolchain $(cat /src/rust-toolchain); \ - rm rustup-init; \ - chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \ - rustup --version; \ - cargo --version; \ - rustc --version; +FROM rust:latest as build COPY . /src RUN cargo install --path /src diff --git a/RustConfig b/RustConfig index 6c3367d..9bcb0b1 100644 --- a/RustConfig +++ b/RustConfig @@ -1 +1 @@ -VERSION=nightly +VERSION=stable diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index c40b898..0000000 --- a/rust-toolchain +++ /dev/null @@ -1,2 +0,0 @@ -nightly-2020-09-27 - diff --git a/src/server/views/html/mod.rs b/src/server/views/html/mod.rs index 7291953..73de6dd 100644 --- a/src/server/views/html/mod.rs +++ b/src/server/views/html/mod.rs @@ -38,7 +38,7 @@ fn render_navbar() -> Markup { header class="navbar" { div class="container" { div class="navbar-brand" { - a class="navbar-item is-dark" href=(SELF_BASE_URL) { + a class="navbar-item is-dark" href=(SELF_BASE_URL.as_str()) { h1 class="title is-3" { "Deps.rs" } } }