Add time as a dependency with 0.3.36 version requirement.

Fixes #82 (breakage caused by the rust 1.80 type inference change debacle) same as #83, but also updated Cargo.lock as requested in #83.
Bump once_cell from 1.18.0 to 1.19.0
2025-05-29 17:14:23 +03:00 · 2024-10-29 17:22:37 +00:00 · 2024-01-03 20:03:26 +00:00 · 2024-01-03 20:03:16 +00:00 · 2024-01-03 20:03:04 +00:00 · 2024-01-03 20:02:51 +00:00
13 changed files with 77 additions and 226 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +1,6 @@
-target
-Dockerfile
+*
+.*
+!src/
+!templates/
+!Cargo.lock
+!Cargo.toml
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,12 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "monthly"
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@ -1,16 +0,0 @@
-name: Security audit
-
-on:
-  push:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
-
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/audit_cron.yml
+++ b/.github/workflows/audit_cron.yml
@ -1,14 +0,0 @@
-name: Security audit (cron)
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  audit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,62 +0,0 @@
-on: [push, pull_request]
-
-name: CI
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@ -1,55 +0,0 @@
-name: Docker
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-on:
-  schedule:
-    - cron: '45 20 * * *'
-  push:
-    branches: [ master ]
-    # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
-  pull_request:
-    branches: [ master ]
-
-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Build and push Docker image
-        id: build-and-push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
--- a/Cargo.lock
+++ b/Cargo.lock
@ -46,9 +46,9 @@ dependencies = [

 [[package]]
 name = "actix-http"
-version = "3.4.0"
+version = "3.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9"
+checksum = "129d4c88e98860e1758c5de288d1632b07970a16d59bdf7b8d66053d582bb71f"
 dependencies = [
 "actix-codec",
 "actix-rt",
@ -156,9 +156,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.4.0"
+version = "4.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9"
+checksum = "e43428f3bf11dee6d166b00ec2df4e3aa8cc1606aaa0b7433c146852e2f4e03b"
 dependencies = [
 "actix-codec",
 "actix-http",
@ -476,7 +476,7 @@ dependencies = [

 [[package]]
 name = "bin"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
 "actix",
 "actix-web",
@ -495,6 +495,7 @@ dependencies = [
 "rand 0.8.5",
 "serde",
 "syntect",
+ "time",
 "tokio",
 ]

@ -884,9 +885,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -899,9 +900,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -909,15 +910,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"

 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
 "futures-core",
 "futures-task",
@ -926,15 +927,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"

 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
@ -943,21 +944,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"

 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"

 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -1417,6 +1418,12 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-traits"
 version = "0.2.17"
@ -1437,9 +1444,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

 [[package]]
 name = "onig"
@ -1985,12 +1992,13 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa",
+ "num-conv",
 "powerfmt",
 "serde",
 "time-core",
@ -2005,10 +2013,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
 "time-core",
 ]

@ -2029,9 +2038,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
 "backtrace",
 "bytes",
@ -2374,20 +2383,19 @@ dependencies = [

 [[package]]
 name = "zstd"
-version = "0.12.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
 dependencies = [
 "zstd-safe",
 ]

 [[package]]
 name = "zstd-safe"
-version = "6.0.6"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
 dependencies = [
- "libc",
 "zstd-sys",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "bin"
-version = "2.0.0"
+version = "2.0.1"
 description = "a paste bin."
 repository = "https://github.com/w4/bin"
 license = "WTFPL OR 0BSD"
@ -12,20 +12,21 @@ argh = "0.1"
 log = "0.4"
 pretty_env_logger = "0.5"
 linked-hash-map = "0.5"
-once_cell = "1.14"
+once_cell = "1.19"
 parking_lot = "0.12"
 bytes = { version = "1.2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 rand = { version = "0.8" }
 gpw = "0.1"
 actix = "0.13"
-actix-web = "4.0"
+actix-web = "4.4"
 htmlescape = "0.3"
 askama = "0.12"
 bat = "0.24"
 syntect = "5.1"
-tokio = { version = "1.20", features = ["sync"] }
+tokio = { version = "1.35", features = ["sync"] }
 futures = "0.3"
+time = "0.3.36"

 [profile.release]
 lto = true
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,8 +0,0 @@
-version: '3'
-services:
-  bin:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "8000:8000"
--- a/src/main.rs
+++ b/src/main.rs
@ -112,9 +112,9 @@ async fn submit_raw(
 ) -> Result<String, Error> {
    let id = generate_id();
    let uri = if let Some(Ok(host)) = host.0.as_ref().map(|v| std::str::from_utf8(v.as_bytes())) {
-        format!("https://{host}/{id}")
+        format!("https://{host}/{id}\n")
    } else {
-        format!("/{id}")
+        format!("/{id}\n")
    };

    store_paste(&store, id, data);
--- a/templates/base.html
+++ b/templates/base.html
@ -1,25 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+    <link rel="icon" href="https://cdn.wzray.com/web/favicon.ico">
+    <link rel="stylesheet" href="https://cdn.wzray.com/web/fonts/mononoki.css">
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>bin.</title>
-    <link rel="help" href="https://github.com/w4/bin">
+    <title>bin</title>
    <style>
        * { box-sizing: border-box; }
        html, body { margin: 0; }
        body {
            height: 100vh;
-            padding: 2rem;
-            background: #263238;
-            color: #B0BEC5;
-            line-height: 1.1;
+            background: #101010;
+            color: #c6c6c6;
            display: flex;
        }
-        body, code, textarea { font-family: monospace; }
-        code {
-          display: block;
-        }
+        body, code, textarea { font-family: mononoki; }
        {% block styles %}{% endblock styles %}
    </style>
    {% block head %}{% endblock head %}
--- a/templates/index.html
+++ b/templates/index.html
@ -2,6 +2,7 @@

 {% block styles %}
    form { flex: 1; }
+    body { padding: 2rem; }

    textarea {
        height: 100%;
@ -10,6 +11,7 @@
        background: none;
        border: none;
        outline: 0;
+        padding: 0;

        resize: none;
        overflow: auto;
@ -29,9 +31,9 @@
        width: 3rem;
        border: none;
        border-radius: 50%;
-        background: #2196F3;
+        background: #696969;

-        color: white;
+        color: #C6C6C6;
        font-size: 2rem;

        cursor: pointer;
--- a/templates/paste.html
+++ b/templates/paste.html
@ -3,30 +3,37 @@
 {% block styles %}
    pre {
        height: 100%;
-        width: 100%;
+        min-width: 100%;
        margin: 0;
        overflow: auto;
        font-family: inherit;
        font-size: 1rem;
        line-height: inherit;
        counter-reset: line;
+        display: flex;
+        flex-direction: column;
+        flex-shrink: 0;
    }
    code {
        counter-increment: line;
+        padding: 0 2rem;
+        display: inline-block;
    }
    code::before {
        content: counter(line);
        display: inline-block;
        width: 2em; /* Fixed width */
-        padding: 0 1em 0.3em 0;
+        padding: 0 1em 0 0;
        margin-right: .5em;
        color: #888;
        -webkit-user-select: none;
    }
+    pre > code:last-child { margin-bottom: 1rem; }
+    pre > code:first-child { margin-top: 1rem; }
 {% endblock styles %}

 {% block head %}
    <link rel="stylesheet" type="text/css" href="highlight.css" />
 {% endblock head %}

-{% block content %}<pre>{{ content|safe }}</pre>{% endblock content %}
+{% block content %}<pre>{{ content|safe }}</pre>{% endblock content %}
Author	SHA1	Message	Date
Arthur K.	44a6e04a42		2025-05-29 17:14:23 +03:00
Andi Powers-Holmes	459cf79f50	Add `time` as a dependency with 0.3.36 version requirement. Fixes #82 (breakage caused by the rust 1.80 type inference change debacle) same as #83, but also updated Cargo.lock as requested in #83.	2024-10-29 17:22:37 +00:00
dependabot[bot]	b049ea3794	Bump once_cell from 1.18.0 to 1.19.0 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.18.0 to 1.19.0. - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.18.0...v1.19.0) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-03 20:03:26 +00:00
dependabot[bot]	411c0eed43	Bump futures from 0.3.29 to 0.3.30 Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.29 to 0.3.30. - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.29...0.3.30) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-03 20:03:16 +00:00
dependabot[bot]	d835347bdb	Bump actix-web from 4.4.0 to 4.4.1 Bumps [actix-web](https://github.com/actix/actix-web) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/actix/actix-web/releases) - [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md) - [Commits](https://github.com/actix/actix-web/compare/web-v4.4.0...web-v4.4.1) --- updated-dependencies: - dependency-name: actix-web dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-03 20:03:04 +00:00
dependabot[bot]	81d4dc7643	Bump tokio from 1.34.0 to 1.35.1 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.34.0 to 1.35.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.34.0...tokio-1.35.1) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-03 20:02:51 +00:00
Egor Tensin	f3ef493ddf	In plaintext mode, end with a newline A curl call like curl -X PUT --data-binary @data.txt https://host/ outputs the paste URL without a newline a-la https://host/somepastenamewhich can mess up the terminal prompt. I don't really see the downside of adding a newline. The workflow of url="$( curl -X PUT --data-binary @data.txt https://host/ )" curl "$url" still works, since the shell strips the newline in command substitutions.	2023-12-24 15:14:46 +00:00
Egor Tensin	6e29e2578d	Same line height on paste submission & view The line-height on the paste submission form & the paste display page is currently effectively different (due to <code>::before padding-bottom). This commit makes the line height uniform on both pages (leaning towards a higher value for better readability).	2023-12-24 08:01:10 +00:00
Egor Tensin	8dd038bc60	Remove default textarea padding <textarea>s have a 2px padding on both Chrome & Firefox. <pre>s, however, don't, which makes for miniscule text jumps between index.html & paste.html.	2023-12-24 08:01:10 +00:00
Jordan Doyle	06513b7095	Bump version to 2.0.1	2023-11-27 20:19:47 +00:00