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

Merge pull request #1401 from jplatte/edition2018

Switch to Rust edition 2018
parents d68077d2 aafa7de8
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
#[allow(clippy::inconsistent_digit_grouping)]
pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&'static str> {
    let mut cfgs = vec![];

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

extern crate autocfg;
extern crate cc;
+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ repository = "https://github.com/sfackler/rust-openssl"
readme = "README.md"
keywords = ["crypto", "tls", "ssl", "dtls"]
categories = ["cryptography", "api-bindings"]
edition = "2018"

# these are deprecated and don't do anything anymore
[features]
@@ -16,7 +17,7 @@ v102 = []
v110 = []
v111 = []

vendored = ['openssl-sys/vendored']
vendored = ['ffi/vendored']

[dependencies]
bitflags = "1.0"
@@ -25,7 +26,7 @@ foreign-types = "0.3.1"
libc = "0.2"
once_cell = "1.5.2"

openssl-sys = { version = "0.9.60", path = "../openssl-sys" }
ffi = { package = "openssl-sys", version = "0.9.60", path = "../openssl-sys" }

[dev-dependencies]
tempdir = "0.3"
+1 −1
Original line number Diff line number Diff line
#![allow(clippy::inconsistent_digit_grouping)]
#![allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]

use std::env;

+0 −2
Original line number Diff line number Diff line
//! A program that generates ca certs, certs verified by the ca, and public
//! and private keys.

extern crate openssl;

use openssl::asn1::Asn1Time;
use openssl::bn::{BigNum, MsbOption};
use openssl::error::ErrorStack;
Loading