b256ee391c
Fixes the manual_flatten clippy lint: ``` warning: unnecessary `if let` since only the `Some` variant of the iterator element is used --> proxmox-apt/src/repositories/mod.rs:40:5 | 40 | for digest in digests.values() { | ^ ---------------- help: try: `digests.values().copied().flatten()` | _____| | | 41 | | if let Some(digest) = digest { 42 | | common_raw.extend_from_slice(&digest[..]); 43 | | } 44 | | } | |_____^ | help: ...and remove the `if let` statement in the for loop --> proxmox-apt/src/repositories/mod.rs:41:9 | 41 | / if let Some(digest) = digest { 42 | | common_raw.extend_from_slice(&digest[..]); 43 | | } | |_________^ = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_flatten = note: `#[warn(clippy::manual_flatten)]` on by default ``` Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com> FG: use `into_values().flatten()` instead of `values().copied().flatten() Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> |
||
---|---|---|
.cargo | ||
proxmox-access-control | ||
proxmox-acme | ||
proxmox-acme-api | ||
proxmox-api-macro | ||
proxmox-apt | ||
proxmox-apt-api-types | ||
proxmox-async | ||
proxmox-auth-api | ||
proxmox-borrow | ||
proxmox-client | ||
proxmox-compression | ||
proxmox-config-digest | ||
proxmox-daemon | ||
proxmox-dns-api | ||
proxmox-http | ||
proxmox-http-error | ||
proxmox-human-byte | ||
proxmox-io | ||
proxmox-lang | ||
proxmox-ldap | ||
proxmox-log | ||
proxmox-login | ||
proxmox-metrics | ||
proxmox-network-api | ||
proxmox-notify | ||
proxmox-openid | ||
proxmox-product-config | ||
proxmox-rest-server | ||
proxmox-router | ||
proxmox-rrd | ||
proxmox-rrd-api-types | ||
proxmox-schema | ||
proxmox-section-config | ||
proxmox-sendmail | ||
proxmox-serde | ||
proxmox-shared-cache | ||
proxmox-shared-memory | ||
proxmox-simple-config | ||
proxmox-sortable-macro | ||
proxmox-subscription | ||
proxmox-sys | ||
proxmox-syslog-api | ||
proxmox-systemd | ||
proxmox-tfa | ||
proxmox-time | ||
proxmox-time-api | ||
proxmox-uuid | ||
proxmox-worker-task | ||
.gitignore | ||
build.sh | ||
bump.sh | ||
Cargo.toml | ||
Makefile | ||
README.md | ||
rustfmt.toml |
Local cargo config
This repository ships with a .cargo/config.toml
that replaces the crates.io
registry with packaged crates located in /usr/share/cargo/registry
.
A similar config is also applied building with dh_cargo
. Cargo.lock needs to
be deleted when switching between packaged crates and crates.io, since the
checksums are not compatible.
To reference new dependencies (or updated versions) that are not yet packaged, the dependency needs to point directly to a path or git source.
Quickly installing all packages from apt
To a void too many manual installations when mk-build-deps
etc. fail, a quick
way to install all the main packages of this workspace is to run:
# apt install $(make list-packages)
Steps for Releases
- Run
./bump.sh <CRATE> [patch|minor|major|<VERSION>]
- Fill out changelog
- Confirm bump commit
- Build packages with
make <crate>-deb
.- Don't forget to commit updated d/control!
Adding Crates
-
At the top level:
- Generate the crate:
cargo new --lib the-name
- Sort the crate into
Cargo.toml
'sworkspace.members
- Generate the crate:
-
In the new crate's
Cargo.toml
:-
In
[package]
set:authors.workspace = true edition.workspace = true exclude.workspace = true homepage.workspace = true license.workspace = true repository.workspace = true rust-version.workspace = true
If a separate
exclude
is need it, separate it out as its own block above the inherited fields. -
Add a meaningful
description
-
Copy
debian/copyright
anddebian/debcargo.toml
from another subcrate.
-
-
In the new crate's
lib.rs
, add the following preamble on top:#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
-
Ideally (but optionally) in the new crate's
lib.rs
, add the following preamble on top as well:#![deny(unsafe_op_in_unsafe_fn)] #![deny(missing_docs)]
Adding a new Dependency
- At the top level:
- Add it to
[workspace.dependencies]
specifying the version and any features that should be enabled throughout the workspace
- Add it to
- In each member's
Cargo.toml
:- Add it to the desired dependencies section with
workspace = true
and no version specified. - If this member requires additional features, add only the extra features to the member dependency.
- Add it to the desired dependencies section with
Updating a Dependency's Version
- At the top level:
- Bump the version in
[workspace.dependencies]
as desired. - Check for deprecations or breakage throughout the workspace.
- Bump the version in
Notes on Workspace Inheritance
Common metadata (like authors, license, ..) are inherited throughout the
workspace. If new fields are added that are identical for all crates, they
should be defined in the top-level Cargo.toml
file's [workspace.package]
section, and inherited in all members explicitly by setting FIELD.workspace = true
in the member's [package]
section.
Dependency information is also inherited throughout the workspace, allowing a
single dependency specification in the top-level Cargo.toml
file to be used
by all members.
Some restrictions apply:
- features can only be added in members, never removed (this includes
default_features = false
!)- the base feature set at the workspace level should be the minimum (possibly empty!) set required by all members
- workspace dependency specifications cannot include
optional
- if needed, the
optional
flag needs to be set at the member level when using a workspace dependency
- if needed, the
Working with other projects while changing to single crates here
When crates from this workspace need changes caused by requirements in projects
outside of this repository, it can often be annoying to keep building and
installing .deb
files.
Additionally, doing so often requires complete rebuilds as cargo will not pick up file changes of external dependencies.
One way to fix this is by actually changing the version. Since we cut away
anything starting at the first hyphen in the version, we need to use a +
(build metadata) version suffix.
Eg. turn 5.0.0
into 5.0.0+test8
.
There are 2 faster ways:
Adding a #[patch.crates-io]
section to the other project.
Note, however, that this requires ALL crates from this workspace to be listed, otherwise multiple conflicting versions of the same crate AND even the same numerical version might be built, causing weird errors.
The advantage, however, is that cargo
will pick up on file changes and rebuild
the crate on changes.
An in-between: system extensions
An easy way to quickly get the new package "installed" temporarily, such that real apt package upgrades are unaffected is as a system-extension.
The easiest way — if no other extensions are used — is to just symlink the
extensions/
directory to /run
as root via:
# ln -s ${THIS_DIR}/extensions /run/extensions
This does not persist across reboots.
(Note: that the extensions/
directory does not need to exist for the above to
work.)
Once this is done, trying a new version of a crate works by:
- Bump the version: eg.
5.0.0+test8
->5.0.0+test9
While this is technically optional (the sysext would then replace (temporarily) the installed version as long as the sysext is active), just like with.deb
files, not doing this causescargo
to consider the crate to be unchanged and it will not rebuild its code. - here:
$ make ${crate}-sysext
(rebuildsextensions/${crate}.raw
) - as root:
# systemd-sysext refresh
(activates current extensions images) - in the other project:
$ cargo update && cargo build
In the last step, cargo sees that there's a newer version of the crate available and use that.