From d0d9683df8398696147e7ee1fcffb2e4e957008c Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Sat, 4 Apr 2020 14:39:19 -0700
Subject: Remove vendored dependencies

While it appears that by now we actually can get successful builds
without Cargo insisting on Internet access by virtue of using the
--frozen flag, maintaining vendored dependencies is somewhat of a pain
point. This state will also get worse with upcoming changes that replace
argparse in favor of structopt and pull in a slew of new dependencies by
doing so. Then there is also the repository structure aspect, which is
non-standard due to the way we vendor dependencies and a potential
source of confusion.
In order to fix these problems, this change removes all the vendored
dependencies we have.

Delete subrepo argparse/:argparse
Delete subrepo base32/:base32
Delete subrepo cc/:cc
Delete subrepo cfg-if/:cfg-if
Delete subrepo getrandom/:getrandom
Delete subrepo lazy-static/:lazy-static
Delete subrepo libc/:libc
Delete subrepo nitrokey-sys/:nitrokey-sys
Delete subrepo nitrokey/:nitrokey
Delete subrepo rand/:rand
---
 nitrokey/tests/util/mod.rs | 113 ---------------------------------------------
 1 file changed, 113 deletions(-)
 delete mode 100644 nitrokey/tests/util/mod.rs

(limited to 'nitrokey/tests/util')

diff --git a/nitrokey/tests/util/mod.rs b/nitrokey/tests/util/mod.rs
deleted file mode 100644
index f2b20ec..0000000
--- a/nitrokey/tests/util/mod.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (C) 2018-2019 Robin Krahl <robin.krahl@ireas.org>
-// SPDX-License-Identifier: MIT
-
-#[macro_export]
-macro_rules! unwrap_ok {
-    ($val:expr) => {{
-        match $val {
-            Ok(val) => val,
-            Err(err) => panic!(
-                r#"assertion failed: `(left == right)`
-  left: `Ok(_)`,
- right: `Err({:?})`"#,
-                err
-            ),
-        }
-    }};
-}
-
-#[macro_export]
-macro_rules! assert_any_ok {
-    ($val:expr) => {{
-        match &$val {
-            Ok(_) => {}
-            Err(err) => panic!(
-                r#"assertion failed: `(left == right)`
-  left: `Ok(_)`,
- right: `Err({:?})`"#,
-                err
-            ),
-        }
-    }};
-}
-
-#[macro_export]
-macro_rules! assert_ok {
-    ($left:expr, $right:expr) => {{
-        match &$right {
-            Ok(right) => match &$left {
-                left => {
-                    if !(*left == *right) {
-                        panic!(
-                            r#"assertion failed: `(left == right)`
-  left: `{:?}`,
- right: `{:?}`"#,
-                            left, right
-                        )
-                    }
-                }
-            },
-            Err(right_err) => panic!(
-                r#"assertion failed: `(left == right)`
-  left: `Ok({:?})`,
- right: `Err({:?})`"#,
-                $left, right_err
-            ),
-        }
-    }};
-}
-
-#[macro_export]
-macro_rules! assert_err {
-    ($err:path, $left:expr, $right:expr) => {
-        match &$right {
-            Err($err(ref right_err)) => match &$left {
-                left_err => {
-                    if !(*left_err == *right_err) {
-                        panic!(
-                            r#"assertion failed: `(left == right)`
-  left: `{:?}`,
- right: `{:?}`"#,
-                            left_err, right_err
-                        )
-                    }
-                }
-            },
-            Err(ref right_err) => panic!(
-                r#"assertion failed: `(left == right)`
-  left: `{:?}`,
- right: `{:?}`"#,
-                $err($left),
-                right_err
-            ),
-            Ok(right_ok) => panic!(
-                r#"assertion failed: `(left == right)`
-  left: `Err({:?})`,
- right: `Ok({:?})`"#,
-                $err($left),
-                right_ok
-            ),
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! assert_cmd_err {
-    ($left:expr, $right:expr) => {
-        assert_err!(::nitrokey::Error::CommandError, $left, $right);
-    };
-}
-
-#[macro_export]
-macro_rules! assert_cmu_err {
-    ($left:expr, $right:expr) => {
-        assert_err!(::nitrokey::Error::CommunicationError, $left, $right);
-    };
-}
-
-#[macro_export]
-macro_rules! assert_lib_err {
-    ($left:expr, $right:expr) => {
-        assert_err!(::nitrokey::Error::LibraryError, $left, $right);
-    };
-}
-- 
cgit v1.2.1