Merge pull request #60 from Roblox/gw/update-rust-toolchain

Update to Rust 1.86 toolchain, 2024 Edition

Author: giladwolff

.github/workflows/format-code.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   format-code:
     runs-on: "ubuntu-latest"
-    container: rust:1.82
+    container: rust:1.86
 
     steps:
       - name: Checkout the code on merge

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   lint:
     runs-on: "ubuntu-latest"
-    container: rust:1.82
+    container: rust:1.86
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         features: [""]
     runs-on: "ubuntu-latest"
-    container: rust:1.82
+    container: rust:1.86
 
     steps:
       - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
       matrix:
         features: [""]
     runs-on: "ubuntu-latest"
-    container: rust:1.82
+    container: rust:1.86
     services:
       consul:
         image: consul:1.11.11

.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: rust:1.82
+    container: rust:1.86
     services:
       consul:
         image: consul:1.11.11
@@ -25,7 +25,7 @@ jobs:
 
   dry-run:
     runs-on: ubuntu-latest
-    container: rust:1.82
+    container: rust:1.86
 
     steps:
       - uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
   publish:
     needs: [test, dry-run]
     runs-on: ubuntu-latest
-    container: rust:1.82
+    container: rust:1.86
     environment: crates-publish
 
     steps:

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## 0.11.0 - 2025-05-13
+- Update Rust toolchain to 1.86
+- Update crate Rust edition support to Rust 2024.
+
 ## 0.10.0 - 2025-05-13
 - Supports registering multiple health checks. This breaks backward compatibility and drops supports to consul servers
 older than 0.5.0 that do not have this commit: [674be58e55f](https://github.com/hashicorp/consul/commit/674be58e55f3f2b1f1c64ef2f52bfbd577db0c7c)

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "rs-consul"
 # Don't forget to update the readme with the new version!
-version = "0.10.0"
+version = "0.11.0"
 authors = ["Roblox"]
-edition = "2021"
+edition = "2024"
 description = "This crate provides access to a set of strongly typed apis to interact with consul (https://www.consul.io/)"
 readme = "README.md"
 repository = "https://github.com/Roblox/rs-consul"

examples/deregister_service.rs

@@ -1,4 +1,4 @@
-use rs_consul::{types::*, Config, Consul};
+use rs_consul::{Config, Consul, types::*};
 
 #[tokio::main] // Enables async main
 async fn main() {

examples/register_service.rs

@@ -1,4 +1,4 @@
-use rs_consul::{types::*, Config, Consul};
+use rs_consul::{Config, Consul, types::*};
 
 #[tokio::main] // Enables async main
 async fn main() {

rust-toolchain

@@ -1 +1 @@
-1.82
+1.86

src/errors.rs

@@ -62,7 +62,9 @@ pub enum ConsulError {
     TimeoutExceeded(std::time::Duration),
 
     /// Unable to resolve the service's instances in Consul.
-    #[error("Unable to resolve service '{0}' to a concrete list of addresses and ports for its instances via consul.")]
+    #[error(
+        "Unable to resolve service '{0}' to a concrete list of addresses and ports for its instances via consul."
+    )]
     ServiceInstanceResolutionFailed(String),
 
     /// An error from ureq occurred.

src/hyper_wrapper.rs

@@ -23,9 +23,9 @@ SOFTWARE.
  */
 use hyper::Version;
 use opentelemetry::{
+    KeyValue,
     global::{BoxedSpan, BoxedTracer},
     trace::{Span, Status, Tracer},
-    KeyValue,
 };
 
 /// Create an OpenTelemetry Span for the given HTTP request, according to the OpenTelemetry

src/lib.rs

@@ -40,8 +40,8 @@ use base64::Engine;
 use http_body_util::combinators::BoxBody;
 use http_body_util::{Empty, Full};
 use hyper::body::Bytes;
-use hyper::{body::Buf, Method};
-use hyper_util::client::legacy::{connect::HttpConnector, Builder, Client};
+use hyper::{Method, body::Buf};
+use hyper_util::client::legacy::{Builder, Client, connect::HttpConnector};
 use serde::{Deserialize, Serialize};
 use slog_scope::{error, info};
 use tokio::time::timeout;
@@ -546,7 +546,8 @@ impl Consul {
             if sn.service.address.is_empty() {
                 info!(
                     "Consul service {service_name} instance had an empty Service address, with port:{port}",
-                    service_name = &sn.service.service, port = sn.service.port
+                    service_name = &sn.service.service,
+                    port = sn.service.port
                 );
                 sn.node.address
             } else {
@@ -637,7 +638,7 @@ impl Consul {
         req.uri(url)
     }
 
-    async fn execute_request<'a>(
+    async fn execute_request(
         &self,
         req: http::request::Builder,
         body: BoxBody<Bytes, Infallible>,

src/lock.rs

@@ -2,8 +2,8 @@ use http_body_util::combinators::BoxBody;
 use hyper::body::Bytes;
 
 use crate::{
-    errors::ConsulError, Consul, CreateOrUpdateKeyRequest, LockRequest, LockWatchRequest,
-    ReadKeyRequest, ReadKeyResponse, ResponseMeta, Result,
+    Consul, CreateOrUpdateKeyRequest, LockRequest, LockWatchRequest, ReadKeyRequest,
+    ReadKeyResponse, ResponseMeta, Result, errors::ConsulError,
 };
 
 /// Represents a lock against Consul.
@@ -100,7 +100,7 @@ impl Consul {
     /// - request - the [LockWatchRequest](consul::types::LockWatchRequest)
     /// # Errors:
     /// [ConsulError](consul::ConsulError) describes all possible errors returned by this api.
-    pub async fn watch_lock<'a>(
+    pub async fn watch_lock(
         &self,
         request: LockWatchRequest<'_>,
     ) -> Result<ResponseMeta<Vec<ReadKeyResponse>>> {

src/utils.rs

@@ -1,4 +1,4 @@
-use crate::{types, QueryOptions};
+use crate::{QueryOptions, types};
 
 pub(crate) fn add_query_option_params(
     uri: &mut String,

tests/test_runner.rs

@@ -102,9 +102,11 @@ mod tests {
             "2.2.2.2".to_string(),
             "3.3.3.3".to_string(),
         ];
-        assert!(expected_addresses
-            .iter()
-            .all(|item| addresses.contains(item)));
+        assert!(
+            expected_addresses
+                .iter()
+                .all(|item| addresses.contains(item))
+        );
 
         let tags: Vec<String> = response
             .iter()