Skip to content

Commit

Permalink
chore(ci): add fmt and clippy checks
Browse files Browse the repository at this point in the history
  • Loading branch information
notmandatory committed Aug 6, 2024
1 parent e7af332 commit daff7a5
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 28 deletions.
45 changes: 35 additions & 10 deletions .github/workflows/cont_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]
name: CI

jobs:
test-fmt:
test:
name: Test
runs-on: ubuntu-20.04
env:
Expand All @@ -16,7 +16,7 @@ jobs:
- 1.63.0 # MSRV
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v2
with:
Expand All @@ -25,14 +25,10 @@ jobs:
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ github.job }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
- name: Install rustup
run: curl https://sh.rustup.rs -sSf | sh -s -- -y
- name: Set default toolchain
run: $HOME/.cargo/bin/rustup default ${{ matrix.rust }}
- name: Set profile
run: $HOME/.cargo/bin/rustup set profile minimal
- name: Fmt
run: cargo fmt -- --check --verbose
- name: Install rust
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
- name: Test
run: cargo test --verbose --all-features
- name: Setup iptables for the timeout test
Expand All @@ -46,3 +42,32 @@ jobs:
- run: cargo check --verbose --no-default-features --features=proxy,use-openssl
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls
- run: cargo check --verbose --no-default-features --features=proxy,use-rustls-ring

fmt:
name: Rust fmt
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
components: rustfmt
- name: Check fmt
run: cargo fmt --all -- --config format_code_in_doc_comments=true --check

clippy_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.78.0
components: clippy
- name: Rust Cache
uses: Swatinem/[email protected]
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features --all-targets -- -D warnings
1 change: 0 additions & 1 deletion src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ impl Client {
/// If no prefix is specified, then `tcp://` is assumed.
///
/// See [Client::from_config] for more configuration options
///
pub fn new(url: &str) -> Result<Self, Error> {
Self::from_config(url, Config::default())
}
Expand Down
5 changes: 1 addition & 4 deletions src/socks/v4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ impl Socks4Stream {
socket.write_all(&packet)?;
let proxy_addr = read_response(&mut socket)?;

Ok(Socks4Stream {
socket,
proxy_addr,
})
Ok(Socks4Stream { socket, proxy_addr })
}

/// Returns the proxy-side address of the connection between the proxy and
Expand Down
16 changes: 3 additions & 13 deletions src/socks/v5.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,7 @@ impl Socks5Stream {

let proxy_addr = read_response(&mut socket)?;

Ok(Socks5Stream {
socket,
proxy_addr,
})
Ok(Socks5Stream { socket, proxy_addr })
}

fn password_authentication(
Expand Down Expand Up @@ -470,10 +467,7 @@ impl Socks5Datagram {
let socket = UdpSocket::bind(addr)?;
socket.connect(&stream.proxy_addr)?;

Ok(Socks5Datagram {
socket,
stream,
})
Ok(Socks5Datagram { socket, stream })
}

/// Like `UdpSocket::send_to`.
Expand Down Expand Up @@ -522,11 +516,7 @@ impl Socks5Datagram {
let addr = read_addr(&mut header)?;

unsafe {
ptr::copy(
buf.as_ptr(),
buf.as_mut_ptr().add(header.len()),
overflow,
);
ptr::copy(buf.as_ptr(), buf.as_mut_ptr().add(header.len()), overflow);
}
buf[..header.len()].copy_from_slice(header);

Expand Down

0 comments on commit daff7a5

Please sign in to comment.