From 1bc49012ebe5e2f068717b79121e2b6e2fc7a600 Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 20 Nov 2024 17:41:08 +0000 Subject: [PATCH 1/6] Ignore .zed folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ff361aa..261e789 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /test_utils/target Cargo.lock .vim +.zed/ From 9184ea60d5589be2b027bef6b2dbfa7aee062a1c Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 20 Nov 2024 17:52:24 +0000 Subject: [PATCH 2/6] fix clippy lint --- src/fs_store.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fs_store.rs b/src/fs_store.rs index 6dc743f..ab33c5d 100644 --- a/src/fs_store.rs +++ b/src/fs_store.rs @@ -16,7 +16,7 @@ use error::ErrorKind; /// data directory without coordination. /// /// > Note that this does not implement [`crate::Storage`] directly but rather is -/// intended to be wrapped in async runtime specific implementations. +/// > intended to be wrapped in async runtime specific implementations. /// /// ## Storage layout /// From 658bb2d9ed4119b9fd7efb280aebdcb4841ba544 Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 27 Nov 2024 12:04:54 +0000 Subject: [PATCH 3/6] update to latest cargo-deny --- deny.toml | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/deny.toml b/deny.toml index 9eaaebc..f0a58a5 100644 --- a/deny.toml +++ b/deny.toml @@ -11,6 +11,7 @@ # Root options +[graph] # If 1 or more target triples (and optionally, target_features) are specified, # only the specified targets will be checked when running `cargo deny check`. # This means, if a particular package is only ever used as a target specific @@ -46,6 +47,8 @@ no-default-features = false # If set, these feature will be enabled when collecting metadata. If `--features` # is specified on the cmd line they will take precedence over this option. #features = [] + +[output] # When outputting inclusion graphs in diagnostics that include features, this # option can be used to specify the depth at which feature edges will be added. # This option is included since the graphs can be quite large and the addition @@ -61,16 +64,8 @@ feature-depth = 1 db-path = "~/.cargo/advisory-db" # The url(s) of the advisory databases to use db-urls = ["https://github.com/rustsec/advisory-db"] -# The lint level for security vulnerabilities -vulnerability = "deny" -# The lint level for unmaintained crates -unmaintained = "warn" # The lint level for crates that have been yanked from their source registry yanked = "warn" -# The lint level for crates with security notices. Note that as of -# 2019-12-17 there are no security notice advisories in -# https://github.com/rustsec/advisory-db -notice = "warn" # A list of advisory IDs to ignore. Note that ignored advisories will still # output a note when they are encountered. ignore = [ @@ -96,8 +91,6 @@ ignore = [ # More documentation for the licenses section can be found here: # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html [licenses] -# The lint level for crates which do not have a detectable license -unlicensed = "deny" # List of explicitly allowed licenses # See https://spdx.org/licenses/ for list of possible licenses # [possible values: any SPDX 3.11 short identifier (+ optional exception)]. @@ -108,26 +101,6 @@ allow = [ "BSD-3-Clause", #"Apache-2.0 WITH LLVM-exception", ] -# List of explicitly disallowed licenses -# See https://spdx.org/licenses/ for list of possible licenses -# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. -deny = [ - #"Nokia", -] -# Lint level for licenses considered copyleft -copyleft = "warn" -# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses -# * both - The license will be approved if it is both OSI-approved *AND* FSF -# * either - The license will be approved if it is either OSI-approved *OR* FSF -# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF -# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved -# * neither - This predicate is ignored and the default lint level is used -allow-osi-fsf-free = "neither" -# Lint level used when no other predicates are matched -# 1. License isn't in the allow or deny lists -# 2. License isn't copyleft -# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" -default = "deny" # The confidence threshold for detecting a license from license text. # The higher the value, the more closely the license text must be to the # canonical license text of a valid SPDX license file. From 5a248ec2e836be38b5d96539a693d46ea3e77c3f Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 27 Nov 2024 12:08:43 +0000 Subject: [PATCH 4/6] update deny for latest unicode-idents license --- deny.toml | 12 ++++++------ scripts/ci/deny | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deny.toml b/deny.toml index f0a58a5..bfe1ff0 100644 --- a/deny.toml +++ b/deny.toml @@ -98,6 +98,12 @@ allow = [ "MIT", "Apache-2.0", "ISC", + "MPL-2.0", + # The Unicode-DFS--2016 license is necessary for various crates because they + # use data from the unicode tables to generate the tables which are + # included in the application. We do not distribute those data files so + # this is not a problem for us. + "Unicode-3.0", "BSD-3-Clause", #"Apache-2.0 WITH LLVM-exception", ] @@ -109,12 +115,6 @@ confidence-threshold = 0.8 # Allow 1 or more licenses on a per-crate basis, so that particular licenses # aren't accepted for every possible crate as with the normal allow list exceptions = [ - # The Unicode-DFS--2016 license is necessary for unicode-ident because they - # use data from the unicode tables to generate the tables which are - # included in the application. We do not distribute those data files so - # this is not a problem for us. See https://github.com/dtolnay/unicode-ident/pull/9/files - # for more details. - { allow = ["MIT", "Apache-2.0", "Unicode-DFS-2016"], name = "unicode-ident" }, # This is fine I think { allow = ["OpenSSL"], name = "ring" }, diff --git a/scripts/ci/deny b/scripts/ci/deny index a043e1d..5590b56 100755 --- a/scripts/ci/deny +++ b/scripts/ci/deny @@ -7,7 +7,7 @@ THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" cd $THIS_SCRIPT/../../ cargo deny --version -cargo deny check advisories -cargo deny check licenses -cargo deny check bans -cargo deny check sources +cargo deny --all-features check advisories +cargo deny --all-features check licenses +cargo deny --all-features check bans +cargo deny --all-features check sources From c14d416b428856d72c9d5d39ed9dd05526d79eb4 Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 27 Nov 2024 12:08:43 +0000 Subject: [PATCH 5/6] actions: update checkout action --- .github/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5f1270e..bd6e5db 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -24,7 +24,7 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -38,7 +38,7 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -58,7 +58,7 @@ jobs: - bans licenses sources continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: EmbarkStudios/cargo-deny-action@v1 with: command: check ${{ matrix.checks }} @@ -70,7 +70,7 @@ jobs: toolchain: - stable steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -86,7 +86,7 @@ jobs: macos: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -102,7 +102,7 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: profile: minimal From 32ef1ba18519e68c8df7cdfc8ebda4154b832fcf Mon Sep 17 00:00:00 2001 From: Alex Good Date: Wed, 27 Nov 2024 12:25:45 +0000 Subject: [PATCH 6/6] actions: update deny action --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bd6e5db..2d3bbb1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,7 +59,7 @@ jobs: continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - uses: actions/checkout@v4 - - uses: EmbarkStudios/cargo-deny-action@v1 + - uses: EmbarkStudios/cargo-deny-action@v2 with: command: check ${{ matrix.checks }}