File tree 3 files changed +6
-25
lines changed
3 files changed +6
-25
lines changed Original file line number Diff line number Diff line change 18
18
runs-on : ubuntu-latest
19
19
steps :
20
20
- uses : actions/checkout@v2
21
- - uses : sfackler/actions/rustup@master
22
- - uses : sfackler/actions/rustfmt@master
21
+ - uses : dtolnay/rust-toolchain@stable
23
22
24
23
windows :
25
24
strategy :
@@ -32,28 +31,12 @@ jobs:
32
31
name : test-${{ matrix.os }}
33
32
runs-on : ${{ matrix.os }}
34
33
steps :
35
- - uses : actions/checkout@v2
36
- - uses : sfackler/actions/rustup@master
37
- with :
38
- version : 1.80.0
34
+ - uses : actions/checkout@v4
35
+ - uses : dtolnay/rust-toolchain@stable
39
36
- run : echo "::set-output name=version::$(rustc --version)"
40
37
id : rust-version
41
- - uses : actions/cache@v1
42
- with :
43
- path : ~/.cargo/registry/index
44
- key : index-${{ runner.os }}-${{ github.run_number }}
45
- restore-keys : |
46
- index-${{ runner.os }}-
47
38
- run : cargo generate-lockfile
48
- - uses : actions/cache@v1
49
- with :
50
- path : ~/.cargo/registry/cache
51
- key : registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
52
39
- run : cargo fetch
53
- - uses : actions/cache@v1
54
- with :
55
- path : target
56
- key : target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
57
40
- run : cargo test --features vendored
58
41
59
42
build_n_test_ios :
Original file line number Diff line number Diff line change @@ -465,9 +465,7 @@ impl<S: io::Read + io::Write> TlsStream<S> {
465
465
match self . 0 . shutdown ( ) {
466
466
Ok ( _) => Ok ( ( ) ) ,
467
467
Err ( ref e) if e. code ( ) == ssl:: ErrorCode :: ZERO_RETURN => Ok ( ( ) ) ,
468
- Err ( e) => Err ( e
469
- . into_io_error ( )
470
- . unwrap_or_else ( |e| io:: Error :: new ( io:: ErrorKind :: Other , e) ) ) ,
468
+ Err ( e) => Err ( e. into_io_error ( ) . unwrap_or_else ( io:: Error :: other) ) ,
471
469
}
472
470
}
473
471
}
Original file line number Diff line number Diff line change 35
35
//! # Cargo Features
36
36
//!
37
37
//! * `vendored` - If enabled, the crate will compile and statically link to a
38
- //! vendored copy of OpenSSL. This feature has no effect on Windows and
39
- //! macOS, where OpenSSL is not used.
38
+ //! vendored copy of OpenSSL. This feature has no effect on Windows and
39
+ //! macOS, where OpenSSL is not used.
40
40
//!
41
41
//! # Examples
42
42
//!
You can’t perform that action at this time.
0 commit comments