diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml index 844afa7..72ae708 100644 --- a/.github/workflows/format-code.yml +++ b/.github/workflows/format-code.yml @@ -8,7 +8,7 @@ on: jobs: format-code: runs-on: "ubuntu-latest" - container: rust:1.72.0 + container: rust:1.74 steps: - name: Checkout the code on merge diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 23e9535..9784d00 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ on: jobs: lint: runs-on: "ubuntu-latest" - container: rust:1.72.0 + container: rust:1.74 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 52b0b9d..d070e22 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: matrix: features: ["", "--no-default-features --features rustls-native"] runs-on: "ubuntu-latest" - container: rust:1.72.0 + container: rust:1.74 steps: - uses: actions/checkout@v2 @@ -26,7 +26,7 @@ jobs: matrix: features: ["", "--no-default-features --features rustls-native"] runs-on: "ubuntu-latest" - container: rust:1.72.0 + container: rust:1.74 services: consul: image: consul:1.11.11 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a59b4b..70f2e84 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: jobs: test: runs-on: ubuntu-latest - container: rust:1.72.0 + container: rust:1.74 services: consul: image: consul:1.11.11 @@ -25,7 +25,7 @@ jobs: dry-run: runs-on: ubuntu-latest - container: rust:1.72.0 + container: rust:1.74 steps: - uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: publish: needs: [test, dry-run] runs-on: ubuntu-latest - container: rust:1.72.0 + container: rust:1.74 environment: crates-publish steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f5670..e5900ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased +## 0.5.0 - 2023-11-20 + +### Added + +- Added support for `deregister-entity`. + +### Changed + +- `opentelemetry` updated to version `0.21` from `0.20`. + +### Changed + +- `opentelemetry` updated to version `0.20` from `0.19`. + ## 0.4.0 - 2023-08-25 ### Changed diff --git a/Cargo.toml b/Cargo.toml index 89322cb..071debc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ http = "0.2" hyper = { version = "0.14", features = ["full"] } hyper-rustls = { version = "0.24" } lazy_static = { version = "1", optional = true } -opentelemetry = { version = "0.20", features = ["rt-tokio"], optional = true } +opentelemetry = { version = "0.21", optional = true } prometheus = { version = "0.13", optional = true } quick-error = "2" serde = { version = "1.0", features = ["derive"] } diff --git a/rust-toolchain b/rust-toolchain index 62bafdd..66acda6 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.72 \ No newline at end of file +1.74 \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs index 3514fff..343bd64 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -237,6 +237,8 @@ fn https_connector() -> hyper_rustls::HttpsConnector { .https_or_http() .enable_http1() .build(); + #[allow(unreachable_code)] + // Clippy doesn't realize if the feature is disabled, this code would execute. hyper_rustls::HttpsConnectorBuilder::new() .with_native_roots() .https_or_http() @@ -1069,20 +1071,19 @@ mod tests { lock_delay: std::time::Duration::from_secs(0), ..Default::default() }; - let start_index: u64; let res = consul.get_lock(req, string_value.as_bytes()).await; assert!(res.is_ok()); let lock = res.unwrap(); let res2 = consul.get_lock(req, string_value.as_bytes()).await; assert!(res2.is_err()); let err = res2.unwrap_err(); - match err { - ConsulError::LockAcquisitionFailure(index) => start_index = index, + let start_index = match err { + ConsulError::LockAcquisitionFailure(index) => index, _ => panic!( "Expected ConsulError::LockAcquisitionFailure, got {:#?}", err ), - } + }; assert!(start_index > 0); let watch_req = LockWatchRequest {