From 35e75745db916a0dc4c01dbf2134eabfe78b12a0 Mon Sep 17 00:00:00 2001
From: Nicola Belluti <nicolabelluti@protonmail.com>
Date: Sun, 16 Jun 2024 17:48:15 +0200
Subject: [PATCH] Put the lib into a workspace
---
Cargo.lock | 24 ++++++++++++------------
Cargo.toml | 18 +++++-------------
flake.lock | 6 +++---
r701/Cargo.toml | 13 +++++++++++++
{src => r701/src}/lib.rs | 0
{src => r701/src}/r701.rs | 2 +-
{src => r701/src}/record.rs | 0
{src => r701/src}/record_iterator.rs | 0
8 files changed, 34 insertions(+), 29 deletions(-)
create mode 100644 r701/Cargo.toml
rename {src => r701/src}/lib.rs (100%)
rename {src => r701/src}/r701.rs (98%)
rename {src => r701/src}/record.rs (100%)
rename {src => r701/src}/record_iterator.rs (100%)
diff --git a/Cargo.lock b/Cargo.lock
index 75c984d..7d69cab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,9 +31,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "cc"
-version = "1.0.96"
+version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
[[package]]
name = "cfg-if"
@@ -94,9 +94,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.154"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
name = "log"
@@ -121,9 +121,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
[[package]]
name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
dependencies = [
"unicode-ident",
]
@@ -147,18 +147,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.200"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.200"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
@@ -167,9 +167,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.60"
+version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index f1d3408..bf42f15 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,5 @@
-[package]
-name = "r701"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
-serde = { version = "1.0.200", default-features = false, features = ["derive"], optional = true }
-
-[features]
-serde = ["chrono/serde", "dep:serde"]
+[workspace]
+resolver = "2"
+members = [
+ "r701",
+]
diff --git a/flake.lock b/flake.lock
index a6a02cd..6883e82 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1714906307,
- "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
+ "lastModified": 1718318537,
+ "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
+ "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"type": "github"
},
"original": {
diff --git a/r701/Cargo.toml b/r701/Cargo.toml
new file mode 100644
index 0000000..1fadaf8
--- /dev/null
+++ b/r701/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "r701"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
+serde = { version = "1.0.203", default-features = false, features = ["derive"], optional = true }
+
+[features]
+serde = ["chrono/serde", "dep:serde"]
diff --git a/src/lib.rs b/r701/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to r701/src/lib.rs
diff --git a/src/r701.rs b/r701/src/r701.rs
similarity index 98%
rename from src/r701.rs
rename to r701/src/r701.rs
index 9b49ce4..e344958 100644
--- a/src/r701.rs
+++ b/r701/src/r701.rs
@@ -146,7 +146,7 @@ impl R701 {
Ok(response[12..1036].to_vec())
}
- pub fn iter(&mut self) -> Result<RecordIterator> {
+ pub fn into_record_iter(&mut self) -> Result<RecordIterator> {
RecordIterator::from(self)
}
}
diff --git a/src/record.rs b/r701/src/record.rs
similarity index 100%
rename from src/record.rs
rename to r701/src/record.rs
diff --git a/src/record_iterator.rs b/r701/src/record_iterator.rs
similarity index 100%
rename from src/record_iterator.rs
rename to r701/src/record_iterator.rs