Skip to content

Commit c50a31d

Browse files
committed
Bump MSRV to 1.85 (for rustls-platform-verifier)
1 parent 3f64760 commit c50a31d

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ jobs:
394394
persist-credentials: false
395395

396396
- name: Install rust toolchain
397-
uses: dtolnay/rust-toolchain@1.73.0
397+
uses: dtolnay/rust-toolchain@1.85.0
398398

399399
- name: Test MSRV
400400
run: cargo check --manifest-path librustls/Cargo.toml --locked --lib --features=aws-lc-rs

librustls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repository = "https://github.com/rustls/rustls-ffi"
1010
categories = ["network-programming", "cryptography"]
1111
edition = "2021"
1212
links = "rustls_ffi"
13-
rust-version = "1.73"
13+
rust-version = "1.85"
1414

1515
[features]
1616
default = ["aws-lc-rs", "prefer-post-quantum"]

librustls/src/acceptor.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ impl rustls_accepted {
342342
/// - The client did not offer the ALPN extension.
343343
/// - The `accepted` parameter was already transformed into a connection
344344
/// with rustls_accepted_into_connection.
345-
///
345+
///
346346
/// The returned value is valid until rustls_accepted_into_connection or
347347
/// rustls_accepted_free is called on the same `accepted`. It is not owned
348348
/// by the caller and does not need to be freed.
@@ -669,7 +669,7 @@ mod tests {
669669
let mut client_conn = null_mut();
670670
let result = rustls_client_config::rustls_client_connection_new(
671671
config,
672-
"example.com\0".as_ptr() as *const c_char,
672+
c"example.com".as_ptr() as *const c_char,
673673
&mut client_conn,
674674
);
675675
assert_eq!(result, rustls_result::Ok);

librustls/src/client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ mod tests {
916916
let mut conn = null_mut();
917917
let result = rustls_client_config::rustls_client_connection_new(
918918
config,
919-
"example.com\0".as_ptr() as *const c_char,
919+
c"example.com".as_ptr() as *const c_char,
920920
&mut conn,
921921
);
922922
if !matches!(result, rustls_result::Ok) {
@@ -969,7 +969,7 @@ mod tests {
969969
let mut conn = null_mut();
970970
let result = rustls_client_config::rustls_client_connection_new_alpn(
971971
config,
972-
"example.com\0".as_ptr() as *const c_char,
972+
c"example.com".as_ptr() as *const c_char,
973973
alpn_protocols.as_ptr(),
974974
alpn_protocols.len() as size_t,
975975
&mut conn,
@@ -1023,7 +1023,7 @@ mod tests {
10231023
let mut conn = null_mut();
10241024
let result = rustls_client_config::rustls_client_connection_new(
10251025
config,
1026-
"198.51.100.198\0".as_ptr() as *const c_char,
1026+
c"198.51.100.198".as_ptr() as *const c_char,
10271027
&mut conn,
10281028
);
10291029
if !matches!(result, rustls_result::Ok) {

0 commit comments

Comments
 (0)