mirror of https://github.com/fafhrd91/actix-web
Merge branch 'master' into #1342-actix_rt-dependency
This commit is contained in:
commit
50f3253992
|
@ -73,12 +73,12 @@ jobs:
|
||||||
args: --package=awc --no-default-features --features=rustls -- --nocapture
|
args: --package=awc --no-default-features --features=rustls -- --nocapture
|
||||||
|
|
||||||
- name: Generate coverage file
|
- name: Generate coverage file
|
||||||
if: matrix.version == 'stable' && (github.ref == 'master' || github.event_name == 'pull_request')
|
if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
|
||||||
run: |
|
run: |
|
||||||
cargo install cargo-tarpaulin
|
cargo install cargo-tarpaulin
|
||||||
cargo tarpaulin --out Xml
|
cargo tarpaulin --out Xml
|
||||||
- name: Upload to Codecov
|
- name: Upload to Codecov
|
||||||
if: matrix.version == 'stable' && (github.ref == 'master' || github.event_name == 'pull_request')
|
if: matrix.version == 'stable' && github.ref == 'refs/heads/master'
|
||||||
uses: codecov/codecov-action@v1
|
uses: codecov/codecov-action@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|
|
@ -443,8 +443,6 @@ where
|
||||||
|
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
/// Start listening for unix domain connections on existing listener.
|
/// Start listening for unix domain connections on existing listener.
|
||||||
///
|
|
||||||
/// This method is available with `uds` feature.
|
|
||||||
pub fn listen_uds(
|
pub fn listen_uds(
|
||||||
mut self,
|
mut self,
|
||||||
lst: std::os::unix::net::UnixListener,
|
lst: std::os::unix::net::UnixListener,
|
||||||
|
@ -483,8 +481,6 @@ where
|
||||||
|
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
/// Start listening for incoming unix domain connections.
|
/// Start listening for incoming unix domain connections.
|
||||||
///
|
|
||||||
/// This method is available with `uds` feature.
|
|
||||||
pub fn bind_uds<A>(mut self, addr: A) -> io::Result<Self>
|
pub fn bind_uds<A>(mut self, addr: A) -> io::Result<Self>
|
||||||
where
|
where
|
||||||
A: AsRef<std::path::Path>,
|
A: AsRef<std::path::Path>,
|
||||||
|
|
Loading…
Reference in New Issue