Unverified Commit 742db0d3 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1357 from stbuehler/clippy-matches-macro 

Silence clippy::match_like_matches_macro (would require rust 1.42)
parents 7f2b63eb c1c379af

openssl-sys/build/main.rs

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ due to this version mismatch. 


// parses a string that looks like "0x100020cfL"

#[allow(deprecated)] // trim_right_matches is now trim_end_matches

#[allow(clippy::match_like_matches_macro)] // matches macro requires rust 1.42.0

fn parse_version(version: &str) -> u64 {

    // cut off the 0x prefix

    assert!(version.starts_with("0x"));

openssl/src/ssl/bio.rs

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ unsafe extern "C" fn bread<S: Read>(bio: *mut BIO, buf: *mut c_char, len: c_int) 
    }

}



#[allow(clippy::match_like_matches_macro)] // matches macro requires rust 1.42.0

fn retriable_error(err: &io::Error) -> bool {

    match err.kind() {

        io::ErrorKind::WouldBlock | io::ErrorKind::NotConnected => true,