From 0209427578d656eab7796c2505dc8755c415785b Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Tue, 22 Jan 2019 17:35:14 +0100
Subject: openpgp-ffi: Cleanup paths in macros.

---
 openpgp-ffi/src/common.rs           | 6 +++---
 openpgp-ffi/src/packet/signature.rs | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'openpgp-ffi/src')

diff --git a/openpgp-ffi/src/common.rs b/openpgp-ffi/src/common.rs
index 98f41278..4c4c1b1a 100644
--- a/openpgp-ffi/src/common.rs
+++ b/openpgp-ffi/src/common.rs
@@ -147,9 +147,9 @@ macro_rules! ffi_make_fry_from_errp {
         macro_rules! ffi_try_status {
             ($expr:expr) => {
                 match $expr {
-                    Ok(_) => Status::Success,
+                    Ok(_) => ::error::Status::Success,
                     Err(e) => {
-                        let status = Status::from(&e);
+                        let status = ::error::Status::from(&e);
                         if let Some(errp) = $errp {
                             *errp = box_raw!(e);
                         }
@@ -219,7 +219,7 @@ macro_rules! box_raw {
 /// This is used to transfer ownership from Rust to C.
 macro_rules! maybe_box_raw {
     ($expr:expr) => {
-        $expr.map(|x| box_raw!(x)).unwrap_or(ptr::null_mut())
+        $expr.map(|x| box_raw!(x)).unwrap_or(::std::ptr::null_mut())
     }
 }
 
diff --git a/openpgp-ffi/src/packet/signature.rs b/openpgp-ffi/src/packet/signature.rs
index 04d64287..5853dfcb 100644
--- a/openpgp-ffi/src/packet/signature.rs
+++ b/openpgp-ffi/src/packet/signature.rs
@@ -7,7 +7,6 @@
 //!
 //!   [Section 5.2 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-5.2
 
-use std::ptr;
 use libc::time_t;
 
 extern crate sequoia_openpgp as openpgp;
-- 
cgit v1.2.3