Skip to content

Check crate MSRVs #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Check crate MSRVs #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c7f902
Revive pull request #1026
fuzzypixelz Mar 6, 2025
00bd9ba
Temporarily disable other checks
fuzzypixelz Mar 6, 2025
461c83d
Remove rust-version fields
fuzzypixelz Mar 6, 2025
673a7b6
Fix `zenoh_macros::RUSTC_VERSION`
fuzzypixelz Mar 7, 2025
b21a41d
Update ring
fuzzypixelz Mar 7, 2025
034b0b3
Update typenum
fuzzypixelz Mar 7, 2025
97d9a7a
Set rust-version everywhere
fuzzypixelz Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
446 changes: 235 additions & 211 deletions .github/workflows/ci.yml
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ members = [
exclude = ["ci/nostd-check", "ci/valgrind-check"]

[workspace.package]
rust-version = "1.75.0"
version = "1.2.1"
repository = "https://github.com/eclipse-zenoh/zenoh"
homepage = "http://zenoh.io"
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-buffers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-buffers"
rust-version = "1.68.2"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
20 changes: 8 additions & 12 deletions commons/zenoh-codec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-codec"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
authors = [
"kydos <[email protected]>",
"Luca Cominardi <[email protected]>",
"Pierre Avital <[email protected]>",
"kydos <[email protected]>",
"Luca Cominardi <[email protected]>",
"Pierre Avital <[email protected]>",
]
edition = { workspace = true }
license = { workspace = true }
Expand All @@ -30,20 +30,16 @@ description = "Internal crate for zenoh."

[features]
default = ["std"]
std = [
"tracing",
"uhlc/std",
"zenoh-protocol/std"
]
std = ["tracing", "uhlc/std", "zenoh-protocol/std"]
shared-memory = [
"std",
"zenoh-shm",
"zenoh-protocol/shared-memory",
"zenoh-buffers/shared-memory"
"zenoh-buffers/shared-memory",
]

[dependencies]
tracing = {workspace = true, optional = true }
tracing = { workspace = true, optional = true }
uhlc = { workspace = true }
zenoh-buffers = { workspace = true, default-features = false }
zenoh-protocol = { workspace = true }
Expand All @@ -55,7 +51,7 @@ criterion = { workspace = true }

rand = { workspace = true, features = ["default"] }
zenoh-protocol = { workspace = true, features = ["test"] }
zenoh-util = {workspace = true }
zenoh-util = { workspace = true }

[[bench]]
name = "codec"
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-collections/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-collections"
rust-version = "1.68.2"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-config"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-core"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-crypto"
rust-version = "1.68.2"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions commons/zenoh-keyexpr/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-keyexpr"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down Expand Up @@ -57,4 +57,4 @@ harness = false

# NOTE: for the above reason, we need to explicitly ignore getrandom in the CI because it's an indirect dependency which is not used directly by zenoh.
[package.metadata.cargo-machete]
ignored = ["getrandom"]
ignored = ["getrandom"]
2 changes: 1 addition & 1 deletion commons/zenoh-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-macros"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
6 changes: 5 additions & 1 deletion commons/zenoh-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ use zenoh_keyexpr::{
key_expr::keyexpr,
};

const RUSTC_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/version.rs"));
#[cfg(not(windows))]
const RUSTC_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "/", "version.rs"));

#[cfg(windows)]
const RUSTC_VERSION: &str = include_str!(concat!(env!("OUT_DIR"), "\\", "version.rs"));

#[proc_macro]
pub fn rustc_version_release(_tokens: TokenStream) -> TokenStream {
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-protocol"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion commons/zenoh-result/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-result"
rust-version = "1.68.2"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
14 changes: 11 additions & 3 deletions commons/zenoh-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zenoh-runtime"
rust-version = { workspace = true }
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand All @@ -20,9 +20,17 @@ tracing = { workspace = true }
ron = { workspace = true }
serde = { workspace = true }
lazy_static = { workspace = true }
tokio = { workspace = true, features = ["fs", "io-util", "macros", "net", "rt-multi-thread", "sync", "time"] }
tokio = { workspace = true, features = [
"fs",
"io-util",
"macros",
"net",
"rt-multi-thread",
"sync",
"time",
] }
zenoh-result = { workspace = true, features = ["std"] }
zenoh-macros = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["ron"]
ignored = ["ron"]
2 changes: 1 addition & 1 deletion commons/zenoh-shm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-shm"
rust-version = "1.71.1"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
9 changes: 7 additions & 2 deletions commons/zenoh-sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-sync"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand All @@ -37,5 +37,10 @@ zenoh-collections = { workspace = true, features = ["default"] }
zenoh-core = { workspace = true }

[dev-dependencies]
tokio = { workspace = true, features = ["macros", "sync", "rt-multi-thread", "time"] }
tokio = { workspace = true, features = [
"macros",
"sync",
"rt-multi-thread",
"time",
] }
zenoh-result = { workspace = true }
8 changes: 4 additions & 4 deletions commons/zenoh-task/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-task"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
authors = {workspace = true }
authors = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
categories = { workspace = true }
Expand All @@ -30,7 +30,7 @@ tracing-instrument = ["zenoh-runtime/tracing-instrument"]
[dependencies]
tokio = { workspace = true, features = ["default", "sync"] }
futures = { workspace = true }
tracing = {workspace = true}
tracing = { workspace = true }
zenoh-core = { workspace = true }
zenoh-runtime = { workspace = true }
tokio-util = { workspace = true, features = ["rt"] }
tokio-util = { workspace = true, features = ["rt"] }
2 changes: 1 addition & 1 deletion commons/zenoh-util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-util"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-examples"
rust-version = "1.74.1"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand All @@ -38,7 +38,9 @@ prost = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "time", "io-std"] }
zenoh = { workspace = true, default-features = false }
zenoh-ext = { workspace = true, default-features = false, features = ["unstable"] }
zenoh-ext = { workspace = true, default-features = false, features = [
"unstable",
] }

[dev-dependencies]
rand = { workspace = true, features = ["default"] }
Expand Down
4 changes: 2 additions & 2 deletions io/zenoh-link-commons/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ edition = { workspace = true }
homepage = { workspace = true }
license = { workspace = true }
name = "zenoh-link-commons"
rust-version = "1.70.0"
repository = { workspace = true }
rust-version = { workspace = true }
version = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -54,4 +54,4 @@ zenoh-runtime = { workspace = true }
zenoh-util = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["rustls-webpki"]
ignored = ["rustls-webpki"]
7 changes: 5 additions & 2 deletions io/zenoh-link/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# ZettaScale Zenoh Team, <[email protected]>
#
[package]
rust-version = { workspace = true }
name = "zenoh-link"
rust-version = "1.70.0"
version = { workspace = true }
repository = { workspace = true }
homepage = { workspace = true }
Expand All @@ -32,7 +32,10 @@ transport_udp = ["zenoh-link-udp"]
transport_unixsock-stream = ["zenoh-link-unixsock_stream"]
transport_ws = ["zenoh-link-ws"]
transport_serial = ["zenoh-link-serial"]
transport_unixpipe = ["zenoh-link-unixpipe", "zenoh-link-unixpipe/transport_unixpipe"]
transport_unixpipe = [
"zenoh-link-unixpipe",
"zenoh-link-unixpipe/transport_unixpipe",
]
transport_vsock = ["zenoh-link-vsock"]

[dependencies]
Expand Down
Loading
Loading