Skip to content

Commit b455e06

Browse files
committed
Remove deprecated deny.toml fields
The fields were deprecated in version 0.14.12. The new default behavior for the fields are: - `unlicensed = "deny"` New default: `deny` - `copyleft = "deny"` New default: `deny` - `allow-osi-fsf-free = "either"` New default: `neither` > It doesn't matter if the license is OSI and/or FSF free, only if it is in the allow (or exception) list. Link to the 0.14.12 changelog: https://github.com/EmbarkStudios/cargo-deny/blob/main/CHANGELOG.md#01412---2024-02-23 This pull request describes the changes and new default behavior in more detail: EmbarkStudios/cargo-deny#611 > This is a follow-up to #606 that actually provides a way to remove the deprecated fields and opt in to the new behavior until the fields are removed and the new behavior becomes the only behavior. Since version 0.16.0 having these fields errors out. https://github.com/EmbarkStudios/cargo-deny/blob/main/CHANGELOG.md#0160---2024-08-02 > ... making the usage of the deprecated fields into errors. The diff in the comments are changes from the current cargo deny template. Signed-off-by: Nico Steinle <nico.steinle@eviden.com>
1 parent ee22485 commit b455e06

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

deny.toml

+14-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
[licenses]
2-
# The lint level for crates which do not have a detectable license
3-
unlicensed = "deny"
4-
52
# List of explictly allowed licenses
63
# See https://spdx.org/licenses/ for list of possible licenses
74
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
8-
allow = ["MPL-2.0"]
9-
10-
# List of explictly disallowed licenses
11-
# See https://spdx.org/licenses/ for list of possible licenses
12-
# [possible values: any SPDX 3.7 short identifier (+ optional exception)].
13-
deny = []
14-
15-
# The lint level for licenses considered copyleft
16-
copyleft = "deny"
17-
18-
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
19-
# * both - The license will only be approved if it is both OSI-approved *AND* FSF/Free
20-
# * either - The license will be approved if it is either OSI-approved *OR* FSF/Free
21-
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF/Free
22-
# * fsf-only - The license will be approved if is FSF/Free *AND NOT* OSI-approved
23-
# * neither - The license will be denied if is FSF/Free *OR* OSI-approved
24-
allow-osi-fsf-free = "either"
5+
allow = [
6+
"Apache-2.0",
7+
"BSD-2-Clause",
8+
"BSD-3-Clause",
9+
"EPL-2.0",
10+
"MIT",
11+
"MPL-2.0",
12+
"Unicode-DFS-2016"
13+
]
2514

2615
# The confidence threshold for detecting a license from license text.
2716
# The higher the value, the more closely the license text must be to the
@@ -48,16 +37,17 @@ allow = [
4837
deny = [
4938
# Each entry the name of a crate and a version range. If version is
5039
# not specified, all versions will be matched.
51-
{ name = "fuchsia-cprng" }
40+
{ crate = "fuchsia-cprng" }
5241
]
5342

5443
# Certain crates/versions that will be skipped when doing duplicate detection.
5544
skip = [
5645
]
5746

58-
# Similarly to `skip` allows you to skip certain crates during duplicate detection,
59-
# unlike skip, it also includes the entire tree of transitive dependencies starting at
60-
# the specified crate, up to a certain depth, which is by default infinite
47+
# Similarly to `skip` allows you to skip certain crates during duplicate
48+
# detection. Unlike skip, it also includes the entire tree of transitive
49+
# dependencies starting at the specified crate, up to a certain depth, which is
50+
# by default infinite.
6151
skip-tree = [
6252
]
6353

0 commit comments

Comments
 (0)