File tree Expand file tree Collapse file tree 3 files changed +7
-25
lines changed Expand file tree Collapse file tree 3 files changed +7
-25
lines changed Original file line number Diff line number Diff line change 1818 runs-on : ubuntu-latest
1919 steps :
2020 - uses : actions/checkout@v2
21- - uses : sfackler/actions/rustup@master
22- - uses : sfackler/actions/rustfmt@master
21+ - uses : dtolnay/rust-toolchain@stable
2322
2423 windows :
2524 strategy :
@@ -32,28 +31,13 @@ jobs:
3231 name : test-${{ matrix.os }}
3332 runs-on : ${{ matrix.os }}
3433 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
3936 - run : echo "::set-output name=version::$(rustc --version)"
4037 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 }}-
4738 - 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') }}
5239 - 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') }}
40+ - run : cargo clippy --all-targets -- -D warnings
5741 - run : cargo test --features vendored
5842
5943 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> {
465465 match self . 0 . shutdown ( ) {
466466 Ok ( _) => Ok ( ( ) ) ,
467467 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) ) ,
471469 }
472470 }
473471}
Original file line number Diff line number Diff line change 3535//! # Cargo Features
3636//!
3737//! * `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.
4040//!
4141//! # Examples
4242//!
You can’t perform that action at this time.
0 commit comments