Skip to content
This repository has been archived by the owner on Feb 8, 2025. It is now read-only.

Commit

Permalink
Update deps & use mold
Browse files Browse the repository at this point in the history
  • Loading branch information
LJ authored and LJ committed Jan 28, 2025
1 parent ce7ec12 commit a9f2025
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 166 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[target.x86_64-unknown-linux-gnu]
linker = "clang"
rustflags = ["-C", "link-arg=-fuse-ld=mold"]
9 changes: 8 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}
steps:
- uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- uses: Swatinem/rust-cache@v2
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check ${{ matrix.checks }}

Expand All @@ -29,6 +30,7 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- name: Install nightly toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -46,6 +48,7 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -59,6 +62,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
Expand All @@ -71,6 +75,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: rui314/setup-mold@v1
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
Expand All @@ -87,6 +92,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
Expand All @@ -102,6 +108,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: rui314/setup-mold@v1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
Expand Down
50 changes: 34 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,57 @@ default = ["http", "ws"]

# Enable models that relate are used in HTTP requests
http = ["racal"]
http_client = ["http", "dep:http", "reqwest", "racal/reqwest", "governor", "async-trait"]
http_client = [
"http",
"dep:http",
"reqwest",
"racal/reqwest",
"governor",
"async-trait",
]

# Enable models that are used in WS requests
ws = []
ws_client = ["ws", "tokio", "ezsockets", "tokio-stream", "dep:http", "tokio-tungstenite", "async-trait"]
ws_client = [
"ws",
"tokio",
"ezsockets",
"tokio-stream",
"dep:http",
"tokio-tungstenite",
"async-trait",
]

# By default we allows deserializing some things partially even with errors.
# Like skipping array entries with errors, which is not wanted for tests though.
debug = []

[dependencies]
serde = { version = "1.0.210", features = ["derive"] }
serde_with = { version = "3.9.0", features = ["time_0_3"] }
time = { version = "0.3.36", default-features = false, features = [
serde = { version = "1.0.217", features = ["derive"] }
serde_with = { version = "3.12.0", features = ["time_0_3"] }
time = { version = "0.3.37", default-features = false, features = [
"serde-well-known",
] }
serde_json = { version = "1.0.128" }
serde_json = { version = "1.0.138" }
strum = { version = "0.26.3", features = ["derive"] }

# API client specifics
racal = { version = "0.4.0", optional = true }
racal = { version = "0.5.0", optional = true }
#racal = { path = "../racal", features = ["reqwest"], optional = true }
governor = { version = "0.6.3", optional = true }
tokio = { version = "1.40.0", optional = true, features = ["macros"]}
tokio-stream = { version = "0.1.16", optional = true}
http = { version = "1.1.0", optional = true }
async-trait = { version = "0.1.83", optional = true }
governor = { version = "0.8.0", optional = true }
tokio = { version = "1.43.0", optional = true, features = ["macros"] }
tokio-stream = { version = "0.1.17", optional = true }
http = { version = "1.2.0", optional = true }
async-trait = { version = "0.1.85", optional = true }
# Required to be defined by us since ezsockets doesn't expose a TLS feature
tokio-tungstenite = {version = "0.24.0", optional= true, default-features = false, features = ["rustls-tls-webpki-roots"] }
tokio-tungstenite = { version = "0.26.1", optional = true, default-features = false, features = [
"rustls-tls-webpki-roots",
] }
typetag = "0.2.19"

[dependencies.reqwest]
optional = true
version = "0.12.7"
version = "0.12.12"
default-features = false
features = ["json", "rustls-tls"]

Expand All @@ -70,8 +88,8 @@ features = ["client", "native_client", "rustls"]

[dev-dependencies]
tokio-test = "0.4.4"
tokio = { version = "1.40.0", features = ["rt", "macros"]}
once_cell = "1.19.0"
tokio = { version = "1.43.0", features = ["rt", "macros"] }
once_cell = "1.20.2"

[package.metadata.docs.rs]
all-features = true
Expand Down
164 changes: 15 additions & 149 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,166 +1,32 @@
# This template contains all of the possible sections and their default values
# See https://embarkstudios.github.io/cargo-deny/checks/cfg.html
[graph]
all-features = true

# Note that all fields that take a lint level have these possible values:
# * deny - An error will be produced and the check will fail
# * warn - A warning will be produced, but the check will not fail
# * allow - No warning or error will be produced, though in some cases a note
# will be

# The values provided in this template are the default values that will be used
# when any section or field is not specified in your own configuration

# 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
# dependency, such as, for example, the `nix` crate only being used via the
# `target_family = "unix"` configuration, that only having windows targets in
# this list would mean the nix crate, as well as any of its exclusive
# dependencies not shared by any other crates, would be ignored, as the target
# list here is effectively saying which targets you are building for.
targets = []

# This section is considered when running `cargo deny check advisories`
# More documentation for the advisories section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
[advisories]
# The path where the advisory database is cloned/fetched into
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 = []
# Threshold for security vulnerabilities, any vulnerability with a CVSS score
# lower than the range specified will be ignored. Note that ignored advisories
# will still output a note when they are encountered.
# * None - CVSS Score 0.0
# * Low - CVSS Score 0.1 - 3.9
# * Medium - CVSS Score 4.0 - 6.9
# * High - CVSS Score 7.0 - 8.9
# * Critical - CVSS Score 9.0 - 10.0
#severity-threshold =
version = 2

# This section is considered when running `cargo deny check licenses`
# 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)].
allow = ["MIT", "ISC", "Apache-2.0", "MPL-2.0", "BSD-3-Clause", "BSD-2-Clause", "OpenSSL", "Unicode-DFS-2016"]
# List of explicitly disallowed licenses
version = 2
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
deny = []
# Lint level for licenses considered copyleft
copyleft = "deny"
# 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.
# [possible values: any between 0.0 and 1.0].
allow = [
"MIT",
"ISC",
"BSD-3-Clause",
"Apache-2.0",
"MPL-2.0",
"Unicode-3.0",
"OpenSSL",
"Zlib"
]
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 = []

# Some crates don't have (easily) machine readable licensing information,
# adding a clarification entry for it allows you to manually specify the
# licensing information
[[licenses.clarify]]
# The name of the crate the clarification applies to
name = "ring"
# The optional version constraint for the crate
version = "*"
# The SPDX expression for the license requirements of the crate
expression = "MIT AND ISC AND OpenSSL"
# One or more files in the crate's source used as the "source of truth" for
# the license expression. If the contents match, the clarification will be used
# when running the license check, otherwise the clarification will be ignored
# and the crate will be checked normally, which may produce warnings or errors
# depending on the rest of your configuration
license-files = []

[licenses.private]
# If true, ignores workspace crates that aren't published, or are only
# published to private registries.
# To see how to mark a crate as unpublished (to the official registry),
# visit https://doc.rust-lang.org/cargo/reference/manifest.html#the-publish-field.
ignore = false
# One or more private registries that you might publish crates to, if a crate
# is only published to private registries, and ignore is true, the crate will
# not have its license(s) checked
registries = []

# This section is considered when running `cargo deny check bans`.
# More documentation about the 'bans' section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
[bans]
# Lint level for when multiple versions of the same crate are detected
multiple-versions = "warn"
# Lint level for when a crate version requirement is `*`
wildcards = "deny"
# The graph highlighting used when creating dotgraphs for crates
# with multiple versions
# * lowest-version - The path to the lowest versioned duplicate is highlighted
# * simplest-path - The path to the version with the fewest edges is highlighted
# * all - Both lowest-version and simplest-path are used
highlight = "all"
# List of crates that are allowed. Use with care!
allow = []
# List of crates to deny
deny = []
# Certain crates/versions that will be skipped when doing duplicate detection.
skip = []
# Similarly to `skip` allows you to skip certain crates during duplicate
# detection. Unlike skip, it also includes the entire tree of transitive
# dependencies starting at the specified crate, up to a certain depth, which is
# by default infinite
skip-tree = []

# This section is considered when running `cargo deny check sources`.
# More documentation about the 'sources' section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html
[sources]
# Lint level for what to happen when a crate from a crate registry that is not
# in the allow list is encountered
unknown-registry = "warn"
# Lint level for what to happen when a crate from a git repository that is not
# in the allow list is encountered
unknown-git = "warn"
# List of URLs for allowed crate registries. Defaults to the crates.io index
# if not specified. If it is specified but empty, no registries are allowed.
allow-registry = ["https://github.com/rust-lang/crates.io-index"]
# List of URLs for allowed Git repositories
allow-git = []

[sources.allow-org]
# 1 or more github.com organizations to allow git sources for
github = []
# 1 or more gitlab.com organizations to allow git sources for
gitlab = []
# 1 or more bitbucket.org organizations to allow git sources for
bitbucket = []

0 comments on commit a9f2025

Please sign in to comment.