Merge branch 'master' into use-wtransport

.github/mergify.yml

@@ -19,6 +19,8 @@ pull_request_rules:
       - label=send-it
       - author!=@libp2p/rust-libp2p-maintainers
       - author!=dependabot[bot]
+      # Do not remove approvals if last commit was a merge of master into the branch, required for the PR to be merged.
+      - commits[-1].author!=@libp2p/rust-libp2p-maintainers
     actions:
       dismiss_reviews:
         message: Approvals have been dismissed because the PR was updated after the
@@ -61,9 +63,8 @@ pull_request_rules:
       queue:
 
 queue_rules:
-  - name: default merge queue
+  - name: default
     queue_conditions:
-      - label=send-it
       - base=master
     merge_conditions: []
     merge_method: squash

Cargo.toml

@@ -125,6 +125,7 @@ futures = "0.3.30"
 futures-bounded = { version = "0.2.4" }
 futures-rustls = { version = "0.26.0", default-features = false }
 getrandom = "0.2"
+if-watch = "3.2.1"
 hickory-proto = { version = "0.25.0-alpha.4", default-features = false }
 hickory-resolver = { version = "0.25.0-alpha.4", default-features = false }
 multiaddr = "0.18.1"

protocols/mdns/Cargo.toml

@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-std  = { version = "1.12.0", optional = true }
 async-io  = { version = "2.3.3", optional = true }
 futures = { workspace = true }
-if-watch = "3.2.0"
+if-watch = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }

transports/quic/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT"
 async-std = { version = "1.12.0", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0.3"
-if-watch = "3.2.0"
+if-watch = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-tls = { workspace = true }
 libp2p-identity = { workspace = true }

transports/tcp/Cargo.toml

@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-io = { version = "2.3.3", optional = true }
 futures = { workspace = true }
 futures-timer = "3.0"
-if-watch = "3.2.0"
+if-watch = { workspace = true }
 libc = "0.2.155"
 libp2p-core = { workspace = true }
 socket2 = { version = "0.5.7", features = ["all"] }

transports/webrtc/Cargo.toml

@@ -15,7 +15,7 @@ async-trait = "0.1"
 futures = { workspace = true }
 futures-timer = "3"
 hex = "0.4"
-if-watch = "3.2"
+if-watch = { workspace = true }
 libp2p-core = { workspace = true }
 libp2p-noise = { workspace = true }
 libp2p-identity = { workspace = true }