Skip to content

Commit dc5d145

Browse files
committed
minor changes
1 parent c21d62c commit dc5d145

File tree

3 files changed

+6
-25
lines changed

3 files changed

+6
-25
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
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,12 @@ 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') }}
5740
- run: cargo test --features vendored
5841

5942
build_n_test_ios:

src/imp/openssl.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff 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
}

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
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
//!

0 commit comments

Comments
 (0)