mirror of
https://gitlab.com/keys.openpgp.org/hagrid.git
synced 2025-10-06 00:23:08 +02:00
Fix broken imports of Result after switch to 2024 edition in "database" crate.
As in 2015 edition we don't need to specify precise import path imports
like "use Result;" led to usage of imported in "lib.rs" anyhow::Result.
After switch to 2024 edition Rust requires to specify path precisely
(actually it starts require that in 2018 I guess).
So, after the switch compiler confuses "use Result;" with import of "use
core::result::Result;" and starts to require additional generic.
Simply pointing to "crate::Result" fixes the problem and points back to
anyhow::Result imported in lib.rs file.
The following compile errors were fixed:
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:54:34
|
54 | fn try_from(uid: &UserID) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
54 | fn try_from(uid: &UserID) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sync.rs:17:44
|
17 | pub fn lock(path: impl AsRef<Path>) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
17 | pub fn lock(path: impl AsRef<Path>) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:59:59
|
59 | pub fn new_from_base(base_dir: impl Into<PathBuf>) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
59 | pub fn new_from_base(base_dir: impl Into<PathBuf>) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:72:10
|
72 | ) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
72 | ) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:81:10
|
81 | ) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
81 | ) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:281:10
|
281 | ) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
281 | ) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:350:67
|
350 | fn link_email_vks(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
350 | fn link_email_vks(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:362:67
|
362 | fn link_email_wkd(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
362 | fn link_email_wkd(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:374:69
|
374 | fn unlink_email_vks(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
374 | fn unlink_email_vks(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:386:69
|
386 | fn unlink_email_wkd(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
386 | fn unlink_email_wkd(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:402:24
|
402 | fn commit(self) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
402 | fn commit(self) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:406:48
|
406 | fn write_to_temp(&self, content: &[u8]) -> Result<Self::TempCert> {
| ^^^^^^ -------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
406 | fn write_to_temp(&self, content: &[u8]) -> Result<Self::TempCert, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:415:76
|
415 | fn move_tmp_to_full(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
415 | fn move_tmp_to_full(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:425:81
|
425 | fn move_tmp_to_published(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
425 | fn move_tmp_to_published(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:439:10
|
439 | ) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
439 | ) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:454:73
|
454 | fn write_to_quarantine(&self, fpr: &Fingerprint, content: &[u8]) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
454 | fn write_to_quarantine(&self, fpr: &Fingerprint, content: &[u8]) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:467:63
|
467 | fn link_email(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
467 | fn link_email(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:478:65
|
478 | fn unlink_email(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
478 | fn unlink_email(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:484:74
|
484 | fn link_fpr(&self, from: &Fingerprint, primary_fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
484 | fn link_fpr(&self, from: &Fingerprint, primary_fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:501:76
|
501 | fn unlink_fpr(&self, from: &Fingerprint, primary_fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
501 | fn unlink_fpr(&self, from: &Fingerprint, primary_fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:528:33
|
528 | fn transaction(&'a self) -> Result<FilesystemTransaction<'a>> {
| ^^^^^^ ------------------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
528 | fn transaction(&'a self) -> Result<FilesystemTransaction<'a>, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:536:78
|
536 | fn write_log_append(&self, filename: &str, fpr_primary: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
536 | fn write_log_append(&self, filename: &str, fpr_primary: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:604:37
|
604 | fn get_last_log_entry(&self) -> Result<Fingerprint> {
| ^^^^^^ ----------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
604 | fn get_last_log_entry(&self) -> Result<Fingerprint, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:624:10
|
624 | ) -> Result<Option<Fingerprint>> {
| ^^^^^^ ------------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
624 | ) -> Result<Option<Fingerprint>, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:659:36
|
659 | fn check_consistency(&self) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
659 | fn check_consistency(&self) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:32:54
|
32 | pub fn new_file(base_dir: impl Into<PathBuf>) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
32 | pub fn new_file(base_dir: impl Into<PathBuf>) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:144:24
|
144 | fn commit(self) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
144 | fn commit(self) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:150:48
|
150 | fn write_to_temp(&self, content: &[u8]) -> Result<Self::TempCert> {
| ^^^^^^ -------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
150 | fn write_to_temp(&self, content: &[u8]) -> Result<Self::TempCert, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:154:76
|
154 | fn move_tmp_to_full(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
154 | fn move_tmp_to_full(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:171:81
|
171 | fn move_tmp_to_published(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
171 | fn move_tmp_to_published(&self, file: Self::TempCert, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:188:10
|
188 | ) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
188 | ) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:200:75
|
200 | fn write_to_quarantine(&self, _fpr: &Fingerprint, _content: &[u8]) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
200 | fn write_to_quarantine(&self, _fpr: &Fingerprint, _content: &[u8]) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:204:63
|
204 | fn link_email(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
204 | fn link_email(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:221:65
|
221 | fn unlink_email(&self, email: &Email, fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
221 | fn unlink_email(&self, email: &Email, fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:231:78
|
231 | fn link_fpr(&self, from_fpr: &Fingerprint, primary_fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
231 | fn link_fpr(&self, from_fpr: &Fingerprint, primary_fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:252:80
|
252 | fn unlink_fpr(&self, from_fpr: &Fingerprint, primary_fpr: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
252 | fn unlink_fpr(&self, from_fpr: &Fingerprint, primary_fpr: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:264:33
|
264 | fn transaction(&'a self) -> Result<Self::Transaction> {
| ^^^^^^ ----------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
264 | fn transaction(&'a self) -> Result<Self::Transaction, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:268:80
|
268 | fn write_log_append(&self, _filename: &str, _fpr_primary: &Fingerprint) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
268 | fn write_log_append(&self, _filename: &str, _fpr_primary: &Fingerprint) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:402:10
|
402 | ) -> Result<Option<Fingerprint>> {
| ^^^^^^ ------------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
402 | ) -> Result<Option<Fingerprint>, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:411:36
|
411 | fn check_consistency(&self) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
411 | fn check_consistency(&self) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:476:37
|
476 | fn get_last_log_entry(&self) -> Result<Fingerprint> {
| ^^^^^^ ----------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
476 | fn get_last_log_entry(&self) -> Result<Fingerprint, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/stateful_tokens.rs:14:50
|
14 | pub fn new(token_dir: impl Into<PathBuf>) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
14 | pub fn new(token_dir: impl Into<PathBuf>) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:97:29
|
97 | fn from_str(s: &str) -> Result<Email> {
| ^^^^^^ ----- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
97 | fn from_str(s: &str) -> Result<Email, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:124:55
|
124 | fn try_from(fpr: sequoia_openpgp::Fingerprint) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
124 | fn try_from(fpr: sequoia_openpgp::Fingerprint) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:163:29
|
163 | fn from_str(s: &str) -> Result<Fingerprint> {
| ^^^^^^ ----------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
163 | fn from_str(s: &str) -> Result<Fingerprint, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:196:55
|
196 | fn try_from(fpr: sequoia_openpgp::Fingerprint) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
196 | fn try_from(fpr: sequoia_openpgp::Fingerprint) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/types.rs:232:29
|
232 | fn from_str(s: &str) -> Result<KeyID> {
| ^^^^^^ ----- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
232 | fn from_str(s: &str) -> Result<KeyID, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:52:34
|
52 | fn ensure_parent(path: &Path) -> Result<&Path> {
| ^^^^^^ ----- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
52 | fn ensure_parent(path: &Path) -> Result<&Path, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:319:60
|
319 | fn symlink(symlink_content: &Path, symlink_name: &Path) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
319 | fn symlink(symlink_content: &Path, symlink_name: &Path) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:334:63
|
334 | fn symlink_unlink_with_check(link: &Path, expected: &Path) -> Result<()> {
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
334 | fn symlink_unlink_with_check(link: &Path, expected: &Path) -> Result<(), E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:268:48
|
268 | fn open_logfile(&self, file_name: &str) -> Result<File> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
268 | fn open_logfile(&self, file_name: &str) -> Result<File, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/fs.rs:280:55
|
280 | check: impl Fn(&Path, &Cert, &Fingerprint) -> Result<()>,
| ^^^^^^ -- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
280 | check: impl Fn(&Path, &Cert, &Fingerprint) -> Result<(), E>,
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:65:56
|
65 | fn build_pool(manager: SqliteConnectionManager) -> Result<r2d2::Pool<SqliteConnectionManager>> {
| ^^^^^^ ----------------------------------- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
65 | fn build_pool(manager: SqliteConnectionManager) -> Result<r2d2::Pool<SqliteConnectionManager>, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:69:77
|
69 | fn new_internal(base_dir: PathBuf, manager: SqliteConnectionManager) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
69 | fn new_internal(base_dir: PathBuf, manager: SqliteConnectionManager) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/sqlite.rs:117:61
|
117 | fn start(pool: &r2d2::Pool<SqliteConnectionManager>) -> Result<Self> {
| ^^^^^^ ---- supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
117 | fn start(pool: &r2d2::Pool<SqliteConnectionManager>) -> Result<Self, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/stateful_tokens.rs:24:66
|
24 | pub fn new_token(&self, token_type: &str, payload: &[u8]) -> Result<String> {
| ^^^^^^ ------ supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
24 | pub fn new_token(&self, token_type: &str, payload: &[u8]) -> Result<String, E> {
| +++
error[E0107]: enum takes 2 generic arguments but 1 generic argument was supplied
--> database/src/stateful_tokens.rs:41:63
|
41 | pub fn pop_token(&self, token_type: &str, token: &str) -> Result<String> {
| ^^^^^^ ------ supplied 1 generic argument
| |
| expected 2 generic arguments
|
note: enum defined here, with 2 generic parameters: `T`, `E`
--> .../.rustup/toolchains/1.86.0-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/core/src/result.rs:528:10
|
528 | pub enum Result<T, E> {
| ^^^^^^ - -
help: add missing generic argument
|
41 | pub fn pop_token(&self, token_type: &str, token: &str) -> Result<String, E> {
| +++
Changes:
- Fix broken imports of Result in "database" crate by importing
crate::Result instead of just Result.
This commit is contained in:
Zeke Fast
@@ -14,7 +14,7 @@ use url::form_urlencoded;
|
||||
|
||||
use crate::sync::FlockMutexGuard;
|
||||
use crate::types::{Email, Fingerprint, KeyID};
|
||||
use Result;
|
||||
use crate::Result;
|
||||
use crate::{Database, Query};
|
||||
|
||||
use crate::wkd;
|
||||
|
||||
@@ -9,7 +9,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
|
||||
|
||||
use openpgp::policy::StandardPolicy;
|
||||
use crate::types::{Email, Fingerprint, KeyID};
|
||||
use Result;
|
||||
use crate::Result;
|
||||
use crate::{Database, Query};
|
||||
|
||||
use openpgp::Cert;
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::path::PathBuf;
|
||||
|
||||
use std::str;
|
||||
|
||||
use Result;
|
||||
use crate::Result;
|
||||
|
||||
pub struct StatefulTokens {
|
||||
token_dir: PathBuf,
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::path::Path;
|
||||
|
||||
use fs2::FileExt;
|
||||
|
||||
use Result;
|
||||
use crate::Result;
|
||||
|
||||
/// A minimalistic flock-based mutex.
|
||||
///
|
||||
|
||||
@@ -12,7 +12,7 @@ use r2d2_sqlite::rusqlite::types::FromSqlResult;
|
||||
use r2d2_sqlite::rusqlite::types::ToSql;
|
||||
use r2d2_sqlite::rusqlite::types::ValueRef;
|
||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||
use Result;
|
||||
use crate::Result;
|
||||
|
||||
/// Holds a normalized email address.
|
||||
///
|
||||
|
||||
Reference in New Issue
Block a user