From 57531dbe5b277a46982e4dd2b0ab6c20ebe43682 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Wed, 14 Oct 2020 11:36:45 +0200
Subject: Replace most 'extern crate' directives with 'use'.

  - See #480.
---
 sqv/build.rs                      | 2 +-
 sqv/src/sqv.rs                    | 4 ++--
 sqv/tests/bad-subkey.rs           | 2 --
 sqv/tests/duplicate-signatures.rs | 2 +-
 sqv/tests/multiple-signatures.rs  | 2 +-
 sqv/tests/not-before-after.rs     | 2 --
 sqv/tests/revoked-key.rs          | 2 --
 sqv/tests/wrong-key-flags.rs      | 4 +---
 8 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'sqv')

diff --git a/sqv/build.rs b/sqv/build.rs
index ea6513b1..7c1eda1c 100644
--- a/sqv/build.rs
+++ b/sqv/build.rs
@@ -1,4 +1,4 @@
-extern crate clap;
+use clap;
 
 use std::env;
 use std::fs;
diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs
index 8e9509e7..45106812 100644
--- a/sqv/src/sqv.rs
+++ b/sqv/src/sqv.rs
@@ -6,10 +6,10 @@
 use std::process::exit;
 
 use chrono::{DateTime, offset::Utc};
-extern crate clap;
+use clap;
 use anyhow::Context;
 
-extern crate sequoia_openpgp as openpgp;
+use sequoia_openpgp as openpgp;
 
 use crate::openpgp::{
     Cert,
diff --git a/sqv/tests/bad-subkey.rs b/sqv/tests/bad-subkey.rs
index bf83e2dc..7e5a4fbd 100644
--- a/sqv/tests/bad-subkey.rs
+++ b/sqv/tests/bad-subkey.rs
@@ -1,5 +1,3 @@
-extern crate assert_cli;
-
 #[cfg(test)]
 mod integration {
     use std::path;
diff --git a/sqv/tests/duplicate-signatures.rs b/sqv/tests/duplicate-signatures.rs
index c91df964..10d789e2 100644
--- a/sqv/tests/duplicate-signatures.rs
+++ b/sqv/tests/duplicate-signatures.rs
@@ -1,4 +1,4 @@
-extern crate assert_cli;
+use assert_cli;
 
 use assert_cli::Assert;
 
diff --git a/sqv/tests/multiple-signatures.rs b/sqv/tests/multiple-signatures.rs
index 69d5a982..e423215e 100644
--- a/sqv/tests/multiple-signatures.rs
+++ b/sqv/tests/multiple-signatures.rs
@@ -1,4 +1,4 @@
-extern crate assert_cli;
+use assert_cli;
 
 use assert_cli::Assert;
 
diff --git a/sqv/tests/not-before-after.rs b/sqv/tests/not-before-after.rs
index 8279f41d..6b2ed805 100644
--- a/sqv/tests/not-before-after.rs
+++ b/sqv/tests/not-before-after.rs
@@ -1,5 +1,3 @@
-extern crate assert_cli;
-
 #[cfg(test)]
 mod integration {
     use assert_cli::Assert;
diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs
index e15ca621..44e41e41 100644
--- a/sqv/tests/revoked-key.rs
+++ b/sqv/tests/revoked-key.rs
@@ -38,8 +38,6 @@
 //!        now -|
 //!             v
 
-extern crate assert_cli;
-
 #[cfg(test)]
 mod integration {
     use assert_cli::Assert;
diff --git a/sqv/tests/wrong-key-flags.rs b/sqv/tests/wrong-key-flags.rs
index 222297c5..477e00d0 100644
--- a/sqv/tests/wrong-key-flags.rs
+++ b/sqv/tests/wrong-key-flags.rs
@@ -1,5 +1,3 @@
-extern crate assert_cli;
-
 #[cfg(test)]
 mod integration {
     use assert_cli::Assert;
@@ -20,7 +18,7 @@ mod integration {
 }
 
 // Code to create the data for the test cases above
-// extern crate sequoia_openpgp;
+// use sequoia_openpgp;
 //
 // #[test]
 // fn create_key() {
-- 
cgit v1.2.3