Skip to content

Commit 179f429

Browse files
committed
Migrate the openssl-sys crate to the 2018 edition
Needed for sfackler#1806
1 parent 11797d9 commit 179f429

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+140
-134
lines changed

openssl-macros/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::uninlined_format_args)]
2+
13
use proc_macro::TokenStream;
24
use proc_macro2::Ident;
35
use quote::quote;

openssl-sys/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ readme = "README.md"
1212
categories = ["cryptography", "external-ffi-bindings"]
1313
links = "openssl"
1414
build = "build/main.rs"
15+
edition = "2018"
1516

1617
[features]
1718
vendored = ['openssl-src']

openssl-sys/build/find_normal.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use pkg_config;
21
use std::ffi::OsString;
32
use std::path::{Path, PathBuf};
43
use std::process::{self, Command};

openssl-sys/build/main.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
#![allow(clippy::inconsistent_digit_grouping, clippy::unusual_byte_groupings)]
1+
#![allow(
2+
clippy::inconsistent_digit_grouping,
3+
clippy::uninlined_format_args,
4+
clippy::unusual_byte_groupings
5+
)]
26

37
extern crate autocfg;
48
#[cfg(feature = "bindgen")]

openssl-sys/src/asn1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::*;
22

3-
use *;
3+
use crate::*;
44

55
// ASN.1 tag values
66
pub const V_ASN1_EOC: c_int = 0;

openssl-sys/src/bio.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::*;
22

3-
use *;
3+
use crate::*;
44

55
pub const BIO_TYPE_NONE: c_int = 0;
66

openssl-sys/src/bn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use libc::*;
22

3-
use *;
3+
use crate::*;
44

55
#[cfg(target_pointer_width = "64")]
66
pub type BN_ULONG = c_ulonglong;

openssl-sys/src/cms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::*;
12
use libc::*;
2-
use *;
33

44
#[cfg(ossl101)]
55
pub const CMS_TEXT: c_uint = 0x1;

openssl-sys/src/crypto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use crate::*;
12
use libc::*;
2-
use *;
33

44
extern "C" {
55
#[deprecated(note = "use CRYPTO_set_locking_callback__fixed_rust instead")]

openssl-sys/src/ec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use libc::*;
22
use std::ptr;
33

4-
use *;
4+
use crate::*;
55

66
pub const OPENSSL_EC_NAMED_CURVE: c_int = 1;
77

0 commit comments

Comments
 (0)