From 7a7db8a131c0da6b3c53869839753e7a54606833 Mon Sep 17 00:00:00 2001
From: Heiko Schaefer <heiko@schaefer.name>
Date: Fri, 20 Aug 2021 22:09:32 +0200
Subject: [PATCH] Rename get_cards->into_cardapps; Fix get_card_app() [doesn't
 need &mut]

---
 card-functionality/src/cards.rs  | 4 ++--
 card-functionality/src/import.rs | 2 +-
 card-functionality/src/keygen.rs | 2 +-
 card-functionality/src/other.rs  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/card-functionality/src/cards.rs b/card-functionality/src/cards.rs
index aa0a808..78d7271 100644
--- a/card-functionality/src/cards.rs
+++ b/card-functionality/src/cards.rs
@@ -38,7 +38,7 @@ pub struct TestCardApp {
 }
 
 impl TestCardApp {
-    pub(crate) fn get_card_app(&mut self) -> Result<CardApp> {
+    pub(crate) fn get_card_app(&self) -> Result<CardApp> {
         self.tc.open()
     }
 
@@ -59,7 +59,7 @@ impl TestConfig {
         Ok(config)
     }
 
-    pub fn get_cards(self) -> Vec<TestCardApp> {
+    pub fn into_cardapps(self) -> Vec<TestCardApp> {
         let mut cards = vec![];
 
         for (name, card) in self.card {
diff --git a/card-functionality/src/import.rs b/card-functionality/src/import.rs
index 959245e..9c6e5fc 100644
--- a/card-functionality/src/import.rs
+++ b/card-functionality/src/import.rs
@@ -15,7 +15,7 @@ fn main() -> Result<()> {
 
     let config = TestConfig::load("config/test-cards.toml")?;
 
-    let cards = config.get_cards();
+    let cards = config.into_cardapps();
 
     for mut card in cards {
         println!("** Run tests on card '{}' **", card.get_name());
diff --git a/card-functionality/src/keygen.rs b/card-functionality/src/keygen.rs
index 94b76a0..fb888b5 100644
--- a/card-functionality/src/keygen.rs
+++ b/card-functionality/src/keygen.rs
@@ -14,7 +14,7 @@ fn main() -> Result<()> {
 
     let config = TestConfig::load("config/test-cards.toml")?;
 
-    let cards = config.get_cards();
+    let cards = config.into_cardapps();
 
     for mut card in cards {
         println!("** Run tests on card {} **", card.get_name());
diff --git a/card-functionality/src/other.rs b/card-functionality/src/other.rs
index 2204c89..71846b8 100644
--- a/card-functionality/src/other.rs
+++ b/card-functionality/src/other.rs
@@ -11,7 +11,7 @@ fn main() -> Result<()> {
 
     let config = TestConfig::load("config/test-cards.toml")?;
 
-    let cards = config.get_cards();
+    let cards = config.into_cardapps();
 
     for mut card in cards {
         println!("** Run tests on card '{}' **", card.get_name());