Skip to content

Commit 720c62d

Browse files
authored
nit cleanups after upgrde to rustc 1.70.0 (#2182)
1 parent 58e0904 commit 720c62d

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ thiserror = { version = "1", default-features = false }
4343
tonic = { version = "0.12", default-features = false }
4444
tonic-build = "0.12"
4545
tokio = { version = "1", default-features = false }
46-
tokio-stream = "0.1.1"
46+
tokio-stream = "0.1"
4747
tracing = { version = "0.1", default-features = false }
4848
tracing-core = { version = "0.1", default-features = false }
4949
tracing-subscriber = { version = "0.3", default-features = false }

opentelemetry-otlp/CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
## vNext
44

5-
- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179)
6-
75
## v0.26.0
86
Released 2024-Sep-30
97

opentelemetry-proto/CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
## vNext
44

5-
- Bump MSRV to 1.70 [#2179](https://github.com/open-telemetry/opentelemetry-rust/pull/2179)
6-
75
## v0.26.0
86
Released 2024-Sep-30
97

opentelemetry-zipkin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ available so be sure to match them appropriately.
108108
## Supported Rust Versions
109109

110110
OpenTelemetry is built against the latest stable release. The minimum supported
111-
version is 1.65. The current OpenTelemetry version is not guaranteed to build on
111+
version is 1.70. The current OpenTelemetry version is not guaranteed to build on
112112
Rust versions earlier than the minimum supported version.
113113

114114
The current stable Rust compiler and the three most recent minor versions before

scripts/patch_dependencies.sh

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
#!/bin/bash
22

3-
# Function to compare two version numbers
4-
function version_lt() {
5-
[ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" != "$2" ]
6-
}
7-
8-
# Get the current Rust compiler version
9-
rust_version=$(rustc --version | cut -d' ' -f2)
10-
11-
# Target version (Rust 1.71.1)
12-
target_version="1.71.1"
13-
14-
function patch_version() {
3+
function patch_version() {
154
local latest_version=$(cargo search --limit 1 $1 | head -1 | cut -d'"' -f2)
165
echo "patching $1 from $latest_version to $2"
176
cargo update -p $1:$latest_version --precise $2
18-
}
7+
}
8+
199

20-
patch_version cc 1.0.105
21-
patch_version url 2.5.0
22-
if version_lt "$rust_version" "$target_version"; then
23-
patch_version tonic 0.12.2
24-
patch_version hyper-rustls 0.27.2 # 0.27.3 needs rustc v1.70.0
25-
patch_version tokio-util 0.7.11 # 0.7.12 needs rustc v1.70.0
26-
patch_version tokio-stream 0.1.15 # 0.1.16 needs rustc v1.70.0
27-
patch_version tokio 1.38.0 # 1.39 needs msrv bump to rustc 1.70
28-
fi

0 commit comments

Comments
 (0)