chore: Add edition to workspace Cargo.toml and inherit workspace edition

dariusc93 · web-flow · commit 2848039b654b · 2025-03-07T18:52:24.000Z
Add edition to workspace Cargo.toml and Inherits workspace edition. Additionally, inherits rust-version in `libp2p-upnp` and `libp2p-websocket-websys`. Pull-Request: #5896.
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,6 +71,7 @@ resolver = "2"
 
 [workspace.package]
 rust-version = "1.83.0"
+edition = "2021"
 
 [workspace.dependencies]
 libp2p = { version = "0.55.1", path = "libp2p" }
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-core"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Core traits and structs of libp2p"
 version = "0.43.0"
diff --git a/examples/autonat/Cargo.toml b/examples/autonat/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "autonat-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT or Apache-2.0"
 
diff --git a/examples/autonatv2/Cargo.toml b/examples/autonatv2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "autonatv2"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT or Apache-2.0"
 
diff --git a/examples/browser-webrtc/Cargo.toml b/examples/browser-webrtc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Doug Anderson <douganderson444@peerpiper.io>"]
 description = "Example use of the WebRTC transport in a browser wasm environment"
-edition = "2021"
+edition.workspace = true
 license = "MIT"
 name = "browser-webrtc-example"
 publish = false
diff --git a/examples/chat/Cargo.toml b/examples/chat/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chat-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/dcutr/Cargo.toml b/examples/dcutr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dcutr-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "distributed-key-value-store-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "file-sharing-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/identify/Cargo.toml b/examples/identify/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "identify-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/ipfs-kad/Cargo.toml b/examples/ipfs-kad/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ipfs-kad-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ipfs-private-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/metrics/Cargo.toml b/examples/metrics/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "metrics-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/ping/Cargo.toml b/examples/ping/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ping-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/relay-server/Cargo.toml b/examples/relay-server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "relay-server-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/rendezvous/Cargo.toml b/examples/rendezvous/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rendezvous-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/stream/Cargo.toml b/examples/stream/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stream-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/examples/upnp/Cargo.toml b/examples/upnp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "upnp-example"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/hole-punching-tests/Cargo.toml b/hole-punching-tests/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hole-punching-tests"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "libp2p-identity"
 version = "0.2.10"
-edition = "2021"
+edition = "2021" # MUST NOT inherit from workspace because we don't want to publish breaking changes to `libp2p-identity`.
 description = "Data structures and algorithms for identifying peers in libp2p."
 rust-version = "1.73.0" # MUST NOT inherit from workspace because we don't want to publish breaking changes to `libp2p-identity`.
 license = "MIT"
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-edition = "2021"
+edition.workspace = true
 name = "interop-tests"
 version = "0.1.0"
 publish = false
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Peer-to-peer networking library"
 version = "0.55.1"
diff --git a/misc/allow-block-list/Cargo.toml b/misc/allow-block-list/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-allow-block-list"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Allow/block list connection management for libp2p."
 version = "0.5.0"
diff --git a/misc/connection-limits/Cargo.toml b/misc/connection-limits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-connection-limits"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Connection limits for libp2p."
 version = "0.5.1"
diff --git a/misc/keygen/Cargo.toml b/misc/keygen/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "keygen"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 authors = ["demfabris <demfabris@gmail.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/misc/memory-connection-limits/Cargo.toml b/misc/memory-connection-limits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-memory-connection-limits"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Memory usage based connection limits for libp2p."
 version = "0.4.0"
diff --git a/misc/metrics/Cargo.toml b/misc/metrics/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-metrics"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Metrics for libp2p"
 version = "0.16.1"
diff --git a/misc/multistream-select/Cargo.toml b/misc/multistream-select/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "multistream-select"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Multistream-select negotiation protocol for libp2p"
 version = "0.13.0"
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "quick-protobuf-codec"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Asynchronous de-/encoding of Protobuf structs using asynchronous-codec, unsigned-varint and quick-protobuf."
 version = "0.3.1"
diff --git a/misc/quickcheck-ext/Cargo.toml b/misc/quickcheck-ext/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "quickcheck-ext"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "Unlicense/MIT"
 
diff --git a/misc/rw-stream-sink/Cargo.toml b/misc/rw-stream-sink/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rw-stream-sink"
-edition = "2021"
+edition.workspace = true
 description = "Adaptator between Stream/Sink and AsyncRead/AsyncWrite"
 rust-version = { workspace = true }
 version = "0.4.0"
diff --git a/misc/server/Cargo.toml b/misc/server/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-server"
 version = "0.12.6"
 authors = ["Max Inden <mail@max-inden.de>"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/libp2p/rust-libp2p"
 rust-version = { workspace = true }
 description = "A rust-libp2p server binary."
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
@@ -2,7 +2,7 @@
 authors = ["Doug Anderson <DougAnderson444@peerpiper.io>"]
 categories = ["network-programming"]
 description = "Utilities for WebRTC in libp2p"
-edition = "2021"
+edition.workspace = true
 license = "MIT"
 name = "libp2p-webrtc-utils"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/muxers/mplex/Cargo.toml b/muxers/mplex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-mplex"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Mplex multiplexing protocol for libp2p"
 version = "0.43.1"
diff --git a/muxers/test-harness/Cargo.toml b/muxers/test-harness/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "libp2p-muxer-test-harness"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 license = "MIT"
 
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-yamux"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Yamux multiplexing protocol for libp2p"
 version = "0.47.0"
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-autonat"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "NAT and firewall detection for libp2p"
 version = "0.14.1"
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-dcutr"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Direct connection upgrade through relay"
 version = "0.13.0"
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-floodsub"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Floodsub protocol for libp2p"
 version = "0.46.1"
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-gossipsub"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Gossipsub protocol for libp2p"
 version = "0.48.1"
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-identify"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Nodes identification protocol for libp2p"
 version = "0.47.0"
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-kad"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Kademlia protocol for libp2p"
 version = "0.47.0"
diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-mdns"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 version = "0.47.0"
 description = "Implementation of the libp2p mDNS discovery method"
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-perf"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "libp2p perf protocol implementation"
 version = "0.4.0"
diff --git a/protocols/ping/Cargo.toml b/protocols/ping/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-ping"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Ping protocol for libp2p"
 version = "0.46.0"
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-relay"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Communications relaying for libp2p"
 version = "0.20.0"
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-rendezvous"
-edition = "2021"
+edition.workspace = true
 rust-version = { workspace = true }
 description = "Rendezvous protocol for libp2p"
 version = "0.16.0"
diff --git a/protocols/request-response/Cargo.toml b/protocols/request-response/Cargo.toml
diff --git a/protocols/stream/Cargo.toml b/protocols/stream/Cargo.toml
diff --git a/protocols/upnp/Cargo.toml b/protocols/upnp/Cargo.toml
diff --git a/swarm-derive/Cargo.toml b/swarm-derive/Cargo.toml
diff --git a/swarm-test/Cargo.toml b/swarm-test/Cargo.toml
diff --git a/swarm/Cargo.toml b/swarm/Cargo.toml
diff --git a/transports/dns/Cargo.toml b/transports/dns/Cargo.toml
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
diff --git a/transports/plaintext/Cargo.toml b/transports/plaintext/Cargo.toml
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
diff --git a/transports/uds/Cargo.toml b/transports/uds/Cargo.toml
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
diff --git a/wasm-tests/webtransport-tests/Cargo.toml b/wasm-tests/webtransport-tests/Cargo.toml
