From 1f2d329549ba477b13bfd877e1888235cadbf2e2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 13 Feb 2022 14:14:52 +0100 Subject: [PATCH] Fix workspace issues --- Cargo.lock | 226 ++++++++++++++++++++++++++++- Cargo.toml | 7 + inboxid-browse/Cargo.toml | 9 +- inboxid-browse/src/main.rs | 2 +- inboxid-fetch/Cargo.toml | 9 +- inboxid-fetch/src/main.rs | 2 +- inboxid-filter/Cargo.toml | 9 +- inboxid-filter/src/main.rs | 2 +- inboxid-li | 42 ------ inboxid-lib/Cargo.toml | 9 +- inboxid-list/Cargo.toml | 9 +- inboxid-list/src/main.rs | 2 +- inboxid-new/Cargo.toml | 9 +- inboxid-new/src/main.rs | 2 +- inboxid-overview/Cargo.toml | 9 +- inboxid-overview/src/main.rs | 2 +- inboxid-sync/Cargo.toml | 9 +- inboxid-sync/src/bin/rebuild-db.rs | 2 +- inboxid-sync/src/main.rs | 2 +- 19 files changed, 255 insertions(+), 108 deletions(-) delete mode 100644 inboxid-li diff --git a/Cargo.lock b/Cargo.lock index c5bb6aa..91f9ec3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -504,7 +504,7 @@ dependencies = [ ] [[package]] -name = "inboxid" +name = "inboxid-browse" version = "0.1.0" dependencies = [ "anyhow", @@ -515,6 +515,230 @@ dependencies = [ "directories-next", "html2text", "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-fetch" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-filter" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-lib" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-list" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-new" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-overview" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", + "itertools", + "log", + "maildir", + "mailparse", + "mailproc", + "mime2ext", + "moins", + "once_cell", + "parking_lot", + "petgraph", + "rusqlite", + "rustls-connector", + "rustyline", + "serde", + "serde_derive", + "subprocess", + "toml", +] + +[[package]] +name = "inboxid-sync" +version = "0.1.0" +dependencies = [ + "anyhow", + "ascii_table", + "chrono", + "cursive", + "cursive_tree_view", + "directories-next", + "html2text", + "imap", + "inboxid-lib", "itertools", "log", "maildir", diff --git a/Cargo.toml b/Cargo.toml index 8bf59a5..e16429b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,10 @@ members = [ "inboxid-overview", "inboxid-sync", ] + +[patch.crates-io] +cursive = { path = "../cursive/cursive" } +cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. + +[profile.release] +overflow-checks = true # useful when debugging diff --git a/inboxid-browse/Cargo.toml b/inboxid-browse/Cargo.toml index 829d119..bfec1d0 100644 --- a/inboxid-browse/Cargo.toml +++ b/inboxid-browse/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-browse" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-browse/src/main.rs b/inboxid-browse/src/main.rs index fb3dd1c..e9a3c13 100644 --- a/inboxid-browse/src/main.rs +++ b/inboxid-browse/src/main.rs @@ -10,7 +10,7 @@ use cursive::traits::Identifiable; use cursive::view::{Scrollable, SizeConstraint, View}; use cursive::views::{Checkbox, LinearLayout, NamedView, OnEventView, Panel, ResizedView, ScrollView, SelectView, TextView}; use cursive_tree_view::{Placement, TreeEntry, TreeView}; -use inboxid::*; +use inboxid_lib::*; use io::Write; use itertools::Itertools; use log::error; diff --git a/inboxid-fetch/Cargo.toml b/inboxid-fetch/Cargo.toml index 829d119..716cabf 100644 --- a/inboxid-fetch/Cargo.toml +++ b/inboxid-fetch/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-fetch" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-fetch/src/main.rs b/inboxid-fetch/src/main.rs index 97d16fc..64b7ecb 100644 --- a/inboxid-fetch/src/main.rs +++ b/inboxid-fetch/src/main.rs @@ -3,7 +3,7 @@ use std::{cmp, env, time::Duration}; use itertools::Itertools; use maildir::Maildir; -use inboxid::*; +use inboxid_lib::*; use mailparse::{MailHeaderMap, parse_headers}; use rusqlite::params; diff --git a/inboxid-filter/Cargo.toml b/inboxid-filter/Cargo.toml index 829d119..ed796b4 100644 --- a/inboxid-filter/Cargo.toml +++ b/inboxid-filter/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-filter" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-filter/src/main.rs b/inboxid-filter/src/main.rs index 83e6409..98709f8 100644 --- a/inboxid-filter/src/main.rs +++ b/inboxid-filter/src/main.rs @@ -1,7 +1,7 @@ use std::env; use anyhow::anyhow; -use inboxid::*; +use inboxid_lib::*; use itertools::Itertools; use mailproc::Config; diff --git a/inboxid-li b/inboxid-li deleted file mode 100644 index 829d119..0000000 --- a/inboxid-li +++ /dev/null @@ -1,42 +0,0 @@ -[package] -name = "inboxid" -version = "0.1.0" -authors = ["Arne Keller "] -edition = "2018" -license = "GPL-3.0-or-later" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -imap = { version = "2.4.1", default-features = false } -itertools = "0.10.0" -maildir = { git = "https://github.com/FliegendeWurst/maildir.git", branch = "master", features = ["mmap"] } -mailparse = "0.13.2" -rustls-connector = "0.13.1" -ascii_table = { git = "https://gitlab.com/arnekeller/ascii-table.git", branch = "master" } -chrono = "0.4.19" -rusqlite = { version = "0.25.0", features = ["bundled"] } -rustyline = "8.0.0" -moins = { git = "https://github.com/FliegendeWurst/moins", branch = "master" } -anyhow = "1.0.40" -mailproc = { git = "https://github.com/FliegendeWurst/mailproc.git", branch = "master" } -subprocess = "0.2.6" -mime2ext = "0.1.2" -petgraph = "0.5.1" -cursive = { version = "0.16.3", default-features = false, features = ["termion-backend"] } -cursive_tree_view = { git = "https://github.com/FliegendeWurst/cursive_tree_view.git", branch = "master" } -directories-next = "2.0.0" -serde_derive = "1.0.25" -serde = "1.0.25" -toml = "0.5.8" -once_cell = "1.7.2" -parking_lot = "0.11.1" -log = "0.4.14" -html2text = "0.2.1" - -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging diff --git a/inboxid-lib/Cargo.toml b/inboxid-lib/Cargo.toml index 829d119..aedb28a 100644 --- a/inboxid-lib/Cargo.toml +++ b/inboxid-lib/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-lib" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -33,10 +33,3 @@ once_cell = "1.7.2" parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" - -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging diff --git a/inboxid-list/Cargo.toml b/inboxid-list/Cargo.toml index 829d119..d908757 100644 --- a/inboxid-list/Cargo.toml +++ b/inboxid-list/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-list" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-list/src/main.rs b/inboxid-list/src/main.rs index b12fbd9..2b1492d 100644 --- a/inboxid-list/src/main.rs +++ b/inboxid-list/src/main.rs @@ -1,7 +1,7 @@ use std::{array::IntoIter, collections::HashSet, env, fs}; use ascii_table::{Align, AsciiTable, Column}; -use inboxid::*; +use inboxid_lib::*; use itertools::Itertools; use mailparse::ParsedMail; use rustyline::{Editor, error::ReadlineError}; diff --git a/inboxid-new/Cargo.toml b/inboxid-new/Cargo.toml index 829d119..4bf0221 100644 --- a/inboxid-new/Cargo.toml +++ b/inboxid-new/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-new" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-new/src/main.rs b/inboxid-new/src/main.rs index 8694e68..7abde0d 100644 --- a/inboxid-new/src/main.rs +++ b/inboxid-new/src/main.rs @@ -3,7 +3,7 @@ use std::{array::IntoIter, env}; use ascii_table::{Align, AsciiTable, Column}; use itertools::Itertools; -use inboxid::*; +use inboxid_lib::*; fn main() -> Result<()> { let args = env::args().collect_vec(); diff --git a/inboxid-overview/Cargo.toml b/inboxid-overview/Cargo.toml index 829d119..a811384 100644 --- a/inboxid-overview/Cargo.toml +++ b/inboxid-overview/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-overview" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-overview/src/main.rs b/inboxid-overview/src/main.rs index ce832d2..249432d 100644 --- a/inboxid-overview/src/main.rs +++ b/inboxid-overview/src/main.rs @@ -1,7 +1,7 @@ use std::array::IntoIter; use ascii_table::{AsciiTable, Align, Column}; -use inboxid::*; +use inboxid_lib::*; fn main() -> Result<()> { let mut dirs = get_maildirs()?; diff --git a/inboxid-sync/Cargo.toml b/inboxid-sync/Cargo.toml index 829d119..79947e7 100644 --- a/inboxid-sync/Cargo.toml +++ b/inboxid-sync/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "inboxid" +name = "inboxid-sync" version = "0.1.0" authors = ["Arne Keller "] edition = "2018" @@ -34,9 +34,4 @@ parking_lot = "0.11.1" log = "0.4.14" html2text = "0.2.1" -[patch.crates-io] -cursive = { path = "../cursive/cursive" } -cursive_core = { path = "../cursive/cursive-core" } # locally patched at v0.2.2 to improve text rendering perf. - -[profile.release] -overflow-checks = true # useful when debugging +inboxid-lib = { path = "../inboxid-lib" } diff --git a/inboxid-sync/src/bin/rebuild-db.rs b/inboxid-sync/src/bin/rebuild-db.rs index 2c65159..d5f3a87 100644 --- a/inboxid-sync/src/bin/rebuild-db.rs +++ b/inboxid-sync/src/bin/rebuild-db.rs @@ -1,6 +1,6 @@ use std::env; -use inboxid::*; +use inboxid_lib::*; use itertools::Itertools; use rusqlite::params; diff --git a/inboxid-sync/src/main.rs b/inboxid-sync/src/main.rs index a8a7154..fd92126 100644 --- a/inboxid-sync/src/main.rs +++ b/inboxid-sync/src/main.rs @@ -5,7 +5,7 @@ use imap::types::{Flag, NameAttribute}; use itertools::Itertools; use maildir::Maildir; -use inboxid::*; +use inboxid_lib::*; use mailparse::{parse_header, parse_headers}; use rusqlite::{Row, params, types::FromSql};