diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-07-09 12:51:10 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-07-15 12:47:53 +0200 |
| commit | 775f0c039349335df880d35db7df6c131419f0eb (patch) | |
| tree | 2d16928f3a629b7afae95cf1b9d518c5603a9f93 /openpgp-ffi/src/armor.rs | |
| parent | caec575e3c44e6045e29aa452ad31f91d04ec139 (diff) | |
Prepare for Rust 2018.
- This is the result of running `cargo fix --edition`, with some
manual adjustments.
- The vast majority of changes merely qualify module paths with
'crate::'.
- Two instances of adding an anonymous pattern to a trait's
function.
- `async` is a keyword in Rust 2018, and hence it needs to be
escaped (e.g. in the case of the net::r#async module).
- The manual adjustments were needed due to various shortcomings of
the analysis employed by `cargo fix`, e.g. unexpanded macros,
procedural macros, lalrpop grammars.
Diffstat (limited to 'openpgp-ffi/src/armor.rs')
| -rw-r--r-- | openpgp-ffi/src/armor.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/openpgp-ffi/src/armor.rs b/openpgp-ffi/src/armor.rs index cb352ca1..008bcf01 100644 --- a/openpgp-ffi/src/armor.rs +++ b/openpgp-ffi/src/armor.rs @@ -14,11 +14,11 @@ extern crate sequoia_openpgp; use self::sequoia_openpgp::armor; use super::io::{Reader, ReaderKind}; -use Maybe; -use MoveIntoRaw; -use MoveResultIntoRaw; -use RefRaw; -use RefMutRaw; +use crate::Maybe; +use crate::MoveIntoRaw; +use crate::MoveResultIntoRaw; +use crate::RefRaw; +use crate::RefMutRaw; /// Represents a (key, value) pair in an armor header. #[repr(C)] @@ -133,7 +133,7 @@ pub extern "C" fn pgp_armor_reader_new(inner: *mut Reader, /// Creates a `Reader` from a file. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] -pub extern "C" fn pgp_armor_reader_from_file(errp: Option<&mut *mut ::error::Error>, +pub extern "C" fn pgp_armor_reader_from_file(errp: Option<&mut *mut crate::error::Error>, filename: *const c_char, mode: c_int) -> Maybe<Reader> @@ -256,7 +256,7 @@ pub extern "C" fn pgp_armor_reader_kind(reader: *const Reader) /// /// [this]: fn.pgp_armor_reader_new.html #[::sequoia_ffi_macros::extern_fn] #[no_mangle] -pub extern "C" fn pgp_armor_reader_headers(errp: Option<&mut *mut ::error::Error>, +pub extern "C" fn pgp_armor_reader_headers(errp: Option<&mut *mut crate::error::Error>, reader: *mut Reader, len: *mut size_t) -> *mut ArmorHeader { @@ -358,7 +358,7 @@ pub extern "C" fn pgp_armor_reader_headers(errp: Option<&mut *mut ::error::Error /// ``` #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" fn pgp_armor_writer_new - (errp: Option<&mut *mut ::error::Error>, + (errp: Option<&mut *mut crate::error::Error>, inner: *mut super::io::Writer, kind: c_int, header: *const ArmorHeader, |