Unverified Commit 3acc5bb2 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #1807 from alex/edition-2018-sys 

Migrate the openssl-sys crate to the 2018 edition
parents 11797d9e dc976d75

openssl-macros/src/lib.rs

+2 −0
Original line number Diff line number Diff line 
#![allow(clippy::uninlined_format_args)]



use proc_macro::TokenStream;

use proc_macro2::Ident;

use quote::quote;

openssl-sys/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ readme = "README.md" 
categories = ["cryptography", "external-ffi-bindings"]

links = "openssl"

build = "build/main.rs"

edition = "2018"



[features]

vendored = ['openssl-src']

openssl-sys/build/find_normal.rs

+0 −1
Original line number Diff line number Diff line 
use pkg_config;

use std::ffi::OsString;

use std::path::{Path, PathBuf};

use std::process::{self, Command};

openssl-sys/build/main.rs

+5 −1
Original line number Diff line number Diff line 
#![allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]

#![allow(

    clippy::inconsistent_digit_grouping,

    clippy::uninlined_format_args,

    clippy::unusual_byte_groupings

)]



extern crate autocfg;

#[cfg(feature = "bindgen")]

openssl-sys/src/asn1.rs

+1 −1
Original line number Diff line number Diff line 
use libc::*;



use *;

use super::*;



// ASN.1 tag values

pub const V_ASN1_EOC: c_int = 0;