Skip to content

Commit b4bae81

Browse files
authored
Merge pull request RustPython#5348 from JamesClarke7283/developer-experiance-tweaks
DX improvements: Updated MSRV, added cargo deny toml file, and added lints to workspace
2 parents e142d65 + 3c10888 commit b4bae81

16 files changed

Lines changed: 299 additions & 7 deletions

File tree

‎Cargo.lock‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "rustpython"
33
version = "0.3.1"
44
authors = ["RustPython Team"]
55
edition = "2021"
6-
rust-version = "1.67.1"
6+
rust-version = "1.75.0"
77
description = "A python interpreter written in rust."
88
repository = "https://github.com/RustPython/RustPython"
99
license = "MIT"
@@ -165,3 +165,15 @@ rev = "2024.02.14"
165165

166166
[package.metadata.vcpkg.target]
167167
x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", dev-dependencies = ["openssl" ] }
168+
169+
# Lints
170+
171+
[workspace.lints.rust]
172+
unsafe_code = "allow"
173+
174+
[workspace.lints.clippy]
175+
perf = "warn"
176+
style = "warn"
177+
complexity = "warn"
178+
suspicious = "warn"
179+
correctness = "warn"

‎common/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ windows-sys = { workspace = true, features = [
4343
"Win32_System_LibraryLoader",
4444
"Win32_System_SystemServices",
4545
] }
46+
47+
[lints]
48+
workspace = true

‎compiler/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ edition = "2021"
1111
rustpython-codegen = { workspace = true }
1212
rustpython-compiler-core = { workspace = true }
1313
rustpython-parser = { workspace = true }
14+
15+
[lints]
16+
workspace = true

‎compiler/codegen/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ num-traits = { workspace = true }
2424
rustpython-parser = { workspace = true }
2525

2626
insta = { workspace = true }
27+
28+
[lints]
29+
workspace = true

‎compiler/core/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@ num-complex = { workspace = true }
1717
serde = { version = "1.0.133", optional = true, default-features = false, features = ["derive"] }
1818

1919
lz4_flex = "0.11"
20+
21+
[lints]
22+
workspace = true

‎deny.toml‎

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,245 @@
1+
# This template contains all of the possible sections and their default values
2+
3+
# Note that all fields that take a lint level have these possible values:
4+
# * deny - An error will be produced and the check will fail
5+
# * warn - A warning will be produced, but the check will not fail
6+
# * allow - No warning or error will be produced, though in some cases a note
7+
# will be
8+
9+
# The values provided in this template are the default values that will be used
10+
# when any section or field is not specified in your own configuration
11+
12+
# Root options
13+
14+
# The graph table configures how the dependency graph is constructed and thus
15+
# which crates the checks are performed against
16+
[graph]
17+
# If 1 or more target triples (and optionally, target_features) are specified,
18+
# only the specified targets will be checked when running `cargo deny check`.
19+
# This means, if a particular package is only ever used as a target specific
20+
# dependency, such as, for example, the `nix` crate only being used via the
21+
# `target_family = "unix"` configuration, that only having windows targets in
22+
# this list would mean the nix crate, as well as any of its exclusive
23+
# dependencies not shared by any other crates, would be ignored, as the target
24+
# list here is effectively saying which targets you are building for.
25+
targets = [
26+
# The triple can be any string, but only the target triples built in to
27+
# rustc (as of 1.40) can be checked against actual config expressions
28+
#"x86_64-unknown-linux-musl",
29+
# You can also specify which target_features you promise are enabled for a
30+
# particular target. target_features are currently not validated against
31+
# the actual valid features supported by the target architecture.
32+
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
33+
]
34+
# When creating the dependency graph used as the source of truth when checks are
35+
# executed, this field can be used to prune crates from the graph, removing them
36+
# from the view of cargo-deny. This is an extremely heavy hammer, as if a crate
37+
# is pruned from the graph, all of its dependencies will also be pruned unless
38+
# they are connected to another crate in the graph that hasn't been pruned,
39+
# so it should be used with care. The identifiers are [Package ID Specifications]
40+
# (https://doc.rust-lang.org/cargo/reference/pkgid-spec.html)
41+
#exclude = []
42+
# If true, metadata will be collected with `--all-features`. Note that this can't
43+
# be toggled off if true, if you want to conditionally enable `--all-features` it
44+
# is recommended to pass `--all-features` on the cmd line instead
45+
all-features = false
46+
# If true, metadata will be collected with `--no-default-features`. The same
47+
# caveat with `all-features` applies
48+
no-default-features = false
49+
# If set, these feature will be enabled when collecting metadata. If `--features`
50+
# is specified on the cmd line they will take precedence over this option.
51+
#features = []
52+
53+
# The output table provides options for how/if diagnostics are outputted
54+
[output]
55+
# When outputting inclusion graphs in diagnostics that include features, this
56+
# option can be used to specify the depth at which feature edges will be added.
57+
# This option is included since the graphs can be quite large and the addition
58+
# of features from the crate(s) to all of the graph roots can be far too verbose.
59+
# This option can be overridden via `--feature-depth` on the cmd line
60+
feature-depth = 1
61+
62+
# This section is considered when running `cargo deny check advisories`
63+
# More documentation for the advisories section can be found here:
64+
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
65+
[advisories]
66+
# The path where the advisory databases are cloned/fetched into
67+
#db-path = "$CARGO_HOME/advisory-dbs"
68+
# The url(s) of the advisory databases to use
69+
#db-urls = ["https://github.com/rustsec/advisory-db"]
70+
# A list of advisory IDs to ignore. Note that ignored advisories will still
71+
# output a note when they are encountered.
72+
ignore = [
73+
#"RUSTSEC-0000-0000",
74+
#{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
75+
#"a-crate-that-is-yanked@0.1.1", # you can also ignore yanked crate versions if you wish
76+
#{ crate = "a-crate-that-is-yanked@0.1.1", reason = "you can specify why you are ignoring the yanked crate" },
77+
]
78+
# If this is true, then cargo deny will use the git executable to fetch advisory database.
79+
# If this is false, then it uses a built-in git library.
80+
# Setting this to true can be helpful if you have special authentication requirements that cargo-deny does not support.
81+
# See Git Authentication for more information about setting up git authentication.
82+
#git-fetch-with-cli = true
83+
84+
# This section is considered when running `cargo deny check licenses`
85+
# More documentation for the licenses section can be found here:
86+
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
87+
[licenses]
88+
# List of explicitly allowed licenses
89+
# See https://spdx.org/licenses/ for list of possible licenses
90+
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
91+
allow = [
92+
"MIT",
93+
"Apache-2.0",
94+
"Apache-2.0 WITH LLVM-exception",
95+
"BSL-1.0",
96+
"LGPL-3.0",
97+
"Zlib",
98+
"Unicode-DFS-2016",
99+
"CC0-1.0",
100+
"BSD-2-Clause",
101+
"BSD-3-Clause",
102+
"Python-2.0.1"
103+
]
104+
# The confidence threshold for detecting a license from license text.
105+
# The higher the value, the more closely the license text must be to the
106+
# canonical license text of a valid SPDX license file.
107+
# [possible values: any between 0.0 and 1.0].
108+
confidence-threshold = 0.8
109+
# Allow 1 or more licenses on a per-crate basis, so that particular licenses
110+
# aren't accepted for every possible crate as with the normal allow list
111+
exceptions = [
112+
# Each entry is the crate and version constraint, and its specific allow
113+
# list
114+
#{ allow = ["Zlib"], crate = "adler32" },
115+
]
116+
117+
# Some crates don't have (easily) machine readable licensing information,
118+
# adding a clarification entry for it allows you to manually specify the
119+
# licensing information
120+
#[[licenses.clarify]]
121+
# The package spec the clarification applies to
122+
#crate = "ring"
123+
# The SPDX expression for the license requirements of the crate
124+
#expression = "MIT AND ISC AND OpenSSL"
125+
# One or more files in the crate's source used as the "source of truth" for
126+
# the license expression. If the contents match, the clarification will be used
127+
# when running the license check, otherwise the clarification will be ignored
128+
# and the crate will be checked normally, which may produce warnings or errors
129+
# depending on the rest of your configuration
130+
#license-files = [
131+
# Each entry is a crate relative path, and the (opaque) hash of its contents
132+
#{ path = "LICENSE", hash = 0xbd0eed23 }
133+
#]
134+
135+
[licenses.private]
136+
# If true, ignores workspace crates that aren't published, or are only
137+
# published to private registries.
138+
# To see how to mark a crate as unpublished (to the official registry),
139+
# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
140+
ignore = false
141+
# One or more private registries that you might publish crates to, if a crate
142+
# is only published to private registries, and ignore is true, the crate will
143+
# not have its license(s) checked
144+
registries = [
145+
#"https://sekretz.com/registry
146+
]
147+
148+
# This section is considered when running `cargo deny check bans`.
149+
# More documentation about the 'bans' section can be found here:
150+
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
151+
[bans]
152+
# Lint level for when multiple versions of the same crate are detected
153+
multiple-versions = "warn"
154+
# Lint level for when a crate version requirement is `*`
155+
wildcards = "allow"
156+
# The graph highlighting used when creating dotgraphs for crates
157+
# with multiple versions
158+
# * lowest-version - The path to the lowest versioned duplicate is highlighted
159+
# * simplest-path - The path to the version with the fewest edges is highlighted
160+
# * all - Both lowest-version and simplest-path are used
161+
highlight = "all"
162+
# The default lint level for `default` features for crates that are members of
163+
# the workspace that is being checked. This can be overridden by allowing/denying
164+
# `default` on a crate-by-crate basis if desired.
165+
workspace-default-features = "allow"
166+
# The default lint level for `default` features for external crates that are not
167+
# members of the workspace. This can be overridden by allowing/denying `default`
168+
# on a crate-by-crate basis if desired.
169+
external-default-features = "allow"
170+
# List of crates that are allowed. Use with care!
171+
allow = [
172+
#"ansi_term@0.11.0",
173+
#{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is allowed" },
174+
]
175+
# List of crates to deny
176+
deny = [
177+
#"ansi_term@0.11.0",
178+
#{ crate = "ansi_term@0.11.0", reason = "you can specify a reason it is banned" },
179+
# Wrapper crates can optionally be specified to allow the crate when it
180+
# is a direct dependency of the otherwise banned crate
181+
#{ crate = "ansi_term@0.11.0", wrappers = ["this-crate-directly-depends-on-ansi_term"] },
182+
]
183+
184+
# List of features to allow/deny
185+
# Each entry the name of a crate and a version range. If version is
186+
# not specified, all versions will be matched.
187+
#[[bans.features]]
188+
#crate = "reqwest"
189+
# Features to not allow
190+
#deny = ["json"]
191+
# Features to allow
192+
#allow = [
193+
# "rustls",
194+
# "__rustls",
195+
# "__tls",
196+
# "hyper-rustls",
197+
# "rustls",
198+
# "rustls-pemfile",
199+
# "rustls-tls-webpki-roots",
200+
# "tokio-rustls",
201+
# "webpki-roots",
202+
#]
203+
# If true, the allowed features must exactly match the enabled feature set. If
204+
# this is set there is no point setting `deny`
205+
#exact = true
206+
207+
# Certain crates/versions that will be skipped when doing duplicate detection.
208+
skip = [
209+
"windows_x86_64_msvc",
210+
"windows_x86_64_gnullvm",
211+
"windows_x86_64_gnu",
212+
"windows_i686_msvc",
213+
"windows_i686_gnu",
214+
"windows_aarch64_msvc",
215+
"windows_aarch64_gnullvm",
216+
"windows-targets",
217+
"windows-sys",
218+
219+
#"ansi_term@0.11.0",
220+
#{ crate = "ansi_term@0.11.0", reason = "you can specify a reason why it can't be updated/removed" },
221+
]
222+
# Similarly to `skip` allows you to skip certain crates during duplicate
223+
# detection. Unlike skip, it also includes the entire tree of transitive
224+
# dependencies starting at the specified crate, up to a certain depth, which is
225+
# by default infinite.
226+
skip-tree = [
227+
#"ansi_term@0.11.0", # will be skipped along with _all_ of its direct and transitive dependencies
228+
#{ crate = "ansi_term@0.11.0", depth = 20 },
229+
]
230+
231+
# This section is considered when running `cargo deny check sources`.
232+
# More documentation about the 'sources' section can be found here:
233+
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
234+
[sources]
235+
# Lint level for what to happen when a crate from a crate registry that is not
236+
# in the allow list is encountered
237+
unknown-registry = "warn"
238+
# Lint level for what to happen when a crate from a git repository that is not
239+
# in the allow list is encountered
240+
unknown-git = "warn"
241+
# List of URLs for allowed crate registries. Defaults to the crates.io index
242+
# if not specified. If it is specified but empty, no registries are allowed.
243+
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
244+
# List of URLs for allowed Git repositories
245+
allow-git = ["https://github.com/RustPython/Parser.git", "https://github.com/RustPython/__doc__"]

‎derive-impl/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ proc-macro2 = "1.0.79"
2121
quote = "1.0.18"
2222
syn-ext = { version = "0.4.0", features = ["full"] }
2323
textwrap = { version = "0.15.0", default-features = false }
24+
25+
[lints]
26+
workspace = true

‎derive/Cargo.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ proc-macro = true
1414
rustpython-compiler = { workspace = true }
1515
rustpython-derive-impl = { workspace = true }
1616
syn = { workspace = true }
17+
18+
[lints]
19+
workspace = true

‎examples/parse_folder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extern crate env_logger;
1212
extern crate log;
1313

1414
use clap::{App, Arg};
15-
use rustpython_parser::{self as parser, ast, Parse};
15+
use rustpython_parser::{ast, Parse};
1616
use std::{
1717
path::Path,
1818
time::{Duration, Instant},

0 commit comments

Comments
 (0)