diff options
72 files changed, 80 insertions, 11 deletions
diff --git a/crates/arti-bench/src/main.rs b/crates/arti-bench/src/main.rs index e7baf1f0d..9ef1b0bdf 100644 --- a/crates/arti-bench/src/main.rs +++ b/crates/arti-bench/src/main.rs @@ -44,6 +44,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // This file uses `unwrap()` a fair deal, but this is fine in test/bench code // because it's OK if tests and benchmarks simply crash if things go wrong. diff --git a/crates/arti-client/src/lib.rs b/crates/arti-client/src/lib.rs index 82c7c170d..f9262bc3f 100644 --- a/crates/arti-client/src/lib.rs +++ b/crates/arti-client/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/arti-config/src/lib.rs b/crates/arti-config/src/lib.rs index f51aea0b7..7996a44fa 100644 --- a/crates/arti-config/src/lib.rs +++ b/crates/arti-config/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // EOF diff --git a/crates/arti-relay/src/main.rs b/crates/arti-relay/src/main.rs index 27ed331e6..4fd78b122 100644 --- a/crates/arti-relay/src/main.rs +++ b/crates/arti-relay/src/main.rs @@ -44,6 +44,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod cli; diff --git a/crates/arti-rpc-client-core/src/lib.rs b/crates/arti-rpc-client-core/src/lib.rs index d6d8a1057..55f545f34 100644 --- a/crates/arti-rpc-client-core/src/lib.rs +++ b/crates/arti-rpc-client-core/src/lib.rs @@ -40,6 +40,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO RPC: Possibly add this to our big list of lints. diff --git a/crates/arti-rpcserver/src/lib.rs b/crates/arti-rpcserver/src/lib.rs index 275a49984..c3fc379d9 100644 --- a/crates/arti-rpcserver/src/lib.rs +++ b/crates/arti-rpcserver/src/lib.rs @@ -40,6 +40,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/arti-testing/src/main.rs b/crates/arti-testing/src/main.rs index ce2bf0600..62da33240 100644 --- a/crates/arti-testing/src/main.rs +++ b/crates/arti-testing/src/main.rs @@ -89,6 +89,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> #![allow(clippy::print_stderr)] // Allowed in this crate only. diff --git a/crates/arti-ureq/src/lib.rs b/crates/arti-ureq/src/lib.rs index 90b634602..142abab99 100644 --- a/crates/arti-ureq/src/lib.rs +++ b/crates/arti-ureq/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::sync::{Arc, Mutex}; diff --git a/crates/arti/src/lib.rs b/crates/arti/src/lib.rs index 128871f1a..665ee315b 100644 --- a/crates/arti/src/lib.rs +++ b/crates/arti/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/arti/src/main.rs b/crates/arti/src/main.rs index 8cb58cc41..9ad5592f2 100644 --- a/crates/arti/src/main.rs +++ b/crates/arti/src/main.rs @@ -43,6 +43,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> fn main() { diff --git a/crates/caret/src/lib.rs b/crates/caret/src/lib.rs index abdb3b81c..4a671751c 100644 --- a/crates/caret/src/lib.rs +++ b/crates/caret/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> /// Declare an integer type with some named elements. diff --git a/crates/equix/src/lib.rs b/crates/equix/src/lib.rs index 2bb38285a..ccbccdab9 100644 --- a/crates/equix/src/lib.rs +++ b/crates/equix/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod bucket_array; diff --git a/crates/fs-mistrust/src/lib.rs b/crates/fs-mistrust/src/lib.rs index 5e1ddbef1..74c729f21 100644 --- a/crates/fs-mistrust/src/lib.rs +++ b/crates/fs-mistrust/src/lib.rs @@ -47,6 +47,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // This crate used to have unsafe code to interact with various libc functions. diff --git a/crates/fslock-guard/src/lib.rs b/crates/fslock-guard/src/lib.rs index c0d95b465..c853b300b 100644 --- a/crates/fslock-guard/src/lib.rs +++ b/crates/fslock-guard/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::path::Path; diff --git a/crates/hashx/src/lib.rs b/crates/hashx/src/lib.rs index f4c9aa551..c84d8f251 100644 --- a/crates/hashx/src/lib.rs +++ b/crates/hashx/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod compiler; diff --git a/crates/oneshot-fused-workaround/src/lib.rs b/crates/oneshot-fused-workaround/src/lib.rs index dc897f564..80b6d4d52 100644 --- a/crates/oneshot-fused-workaround/src/lib.rs +++ b/crates/oneshot-fused-workaround/src/lib.rs @@ -59,6 +59,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use futures::channel::oneshot as fut_oneshot; diff --git a/crates/retry-error/src/lib.rs b/crates/retry-error/src/lib.rs index b61d9f28f..f278de809 100644 --- a/crates/retry-error/src/lib.rs +++ b/crates/retry-error/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::error::Error; diff --git a/crates/safelog/src/lib.rs b/crates/safelog/src/lib.rs index 24c5e84bf..41ce4a97e 100644 --- a/crates/safelog/src/lib.rs +++ b/crates/safelog/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO: Try making it not Deref and having expose+expose_mut instead; how bad is it? diff --git a/crates/slotmap-careful/src/lib.rs b/crates/slotmap-careful/src/lib.rs index 4e6a6ccf8..afd32d055 100644 --- a/crates/slotmap-careful/src/lib.rs +++ b/crates/slotmap-careful/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod key_data; diff --git a/crates/test-temp-dir/src/lib.rs b/crates/test-temp-dir/src/lib.rs index b54023b13..66dba2c3a 100644 --- a/crates/test-temp-dir/src/lib.rs +++ b/crates/test-temp-dir/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // We have a nonstandard test lint block diff --git a/crates/tor-async-utils/src/lib.rs b/crates/tor-async-utils/src/lib.rs index 2e0ff39d2..2d77beae7 100644 --- a/crates/tor-async-utils/src/lib.rs +++ b/crates/tor-async-utils/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod join_read_write; diff --git a/crates/tor-basic-utils/src/lib.rs b/crates/tor-basic-utils/src/lib.rs index 3484f32de..ee4ebdabf 100644 --- a/crates/tor-basic-utils/src/lib.rs +++ b/crates/tor-basic-utils/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::collections::BinaryHeap; diff --git a/crates/tor-bytes/src/lib.rs b/crates/tor-bytes/src/lib.rs index 32b8945f2..ac6fd6a10 100644 --- a/crates/tor-bytes/src/lib.rs +++ b/crates/tor-bytes/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod err; diff --git a/crates/tor-cell/src/lib.rs b/crates/tor-cell/src/lib.rs index 8e9dc8f2f..1d96fee5b 100644 --- a/crates/tor-cell/src/lib.rs +++ b/crates/tor-cell/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod chancell; diff --git a/crates/tor-cert/src/lib.rs b/crates/tor-cert/src/lib.rs index 0dc388698..0b917c2d3 100644 --- a/crates/tor-cert/src/lib.rs +++ b/crates/tor-cert/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod err; diff --git a/crates/tor-chanmgr/src/lib.rs b/crates/tor-chanmgr/src/lib.rs index e28bdcca8..82ff1c90f 100644 --- a/crates/tor-chanmgr/src/lib.rs +++ b/crates/tor-chanmgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod builder; diff --git a/crates/tor-checkable/src/lib.rs b/crates/tor-checkable/src/lib.rs index 4f081d85d..34b12c151 100644 --- a/crates/tor-checkable/src/lib.rs +++ b/crates/tor-checkable/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::time; diff --git a/crates/tor-circmgr/src/lib.rs b/crates/tor-circmgr/src/lib.rs index b82f40d9d..8b87e1b76 100644 --- a/crates/tor-circmgr/src/lib.rs +++ b/crates/tor-circmgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-config-path/src/lib.rs b/crates/tor-config-path/src/lib.rs index 116c13eea..72135c127 100644 --- a/crates/tor-config-path/src/lib.rs +++ b/crates/tor-config-path/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::collections::HashMap; diff --git a/crates/tor-config/src/lib.rs b/crates/tor-config/src/lib.rs index 2be447350..efb8bb220 100644 --- a/crates/tor-config/src/lib.rs +++ b/crates/tor-config/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod cmdline; diff --git a/crates/tor-consdiff/src/lib.rs b/crates/tor-consdiff/src/lib.rs index 8d1ee469f..69000c805 100644 --- a/crates/tor-consdiff/src/lib.rs +++ b/crates/tor-consdiff/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use std::fmt::{Display, Formatter}; diff --git a/crates/tor-dirclient/src/lib.rs b/crates/tor-dirclient/src/lib.rs index 172060ea5..be62a16b6 100644 --- a/crates/tor-dirclient/src/lib.rs +++ b/crates/tor-dirclient/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO probably remove this at some point - see tpo/core/arti#1060 diff --git a/crates/tor-dirmgr/src/bridgedesc/bdtest.rs b/crates/tor-dirmgr/src/bridgedesc/bdtest.rs index d7b917303..b1f58bd3b 100644 --- a/crates/tor-dirmgr/src/bridgedesc/bdtest.rs +++ b/crates/tor-dirmgr/src/bridgedesc/bdtest.rs @@ -217,7 +217,7 @@ where .and_then(|()| bdm.mgr.lock_only().running.is_empty().then_some(())) }) .await; - bdm.set_bridges(&[bridge.clone()]); + bdm.set_bridges(std::slice::from_ref(bridge)); } fn bad_bridge(i: usize) -> BridgeKey { @@ -242,7 +242,7 @@ fn success() -> Result<(), anyhow::Error> { let hold = mock.mstate.lock().await; - bdm.set_bridges(&[bridge.clone()]); + bdm.set_bridges(std::slice::from_ref(&bridge)); bdm.check_consistency(Some([&bridge])); drop(hold); @@ -398,7 +398,7 @@ fn cache() -> Result<(), anyhow::Error> { eprintln!("----- test that a downloaded descriptor goes into the cache -----"); - bdm.set_bridges(&[bridge.clone()]); + bdm.set_bridges(std::slice::from_ref(&bridge)); stream_drain_until(3, &mut events, || async { in_results(Some(Ok(()))) }).await; mock.expect_download_calls(1).await; @@ -481,7 +481,7 @@ fn dormant() -> Result<(), anyhow::Error> { eprintln!("----- become dormant, but request a bridge -----"); bdm.set_dormancy(Dormant); - bdm.set_bridges(&[bridge.clone()]); + bdm.set_bridges(std::slice::from_ref(&bridge)); // Drive all tasks until we are idle runtime.progress_until_stalled().await; diff --git a/crates/tor-dirmgr/src/lib.rs b/crates/tor-dirmgr/src/lib.rs index 80bfb6755..4d322f36d 100644 --- a/crates/tor-dirmgr/src/lib.rs +++ b/crates/tor-dirmgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // This clippy lint produces a false positive on `use strum`, below. diff --git a/crates/tor-error/src/lib.rs b/crates/tor-error/src/lib.rs index abd15608b..eacce8046 100644 --- a/crates/tor-error/src/lib.rs +++ b/crates/tor-error/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use derive_more::Display; diff --git a/crates/tor-events/src/lib.rs b/crates/tor-events/src/lib.rs index ec2781f12..e51dc03f2 100644 --- a/crates/tor-events/src/lib.rs +++ b/crates/tor-events/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod events; diff --git a/crates/tor-general-addr/src/lib.rs b/crates/tor-general-addr/src/lib.rs index 5973bbd6e..6ea37f36e 100644 --- a/crates/tor-general-addr/src/lib.rs +++ b/crates/tor-general-addr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod general; diff --git a/crates/tor-geoip/src/lib.rs b/crates/tor-geoip/src/lib.rs index dc038e0e5..b567677b7 100644 --- a/crates/tor-geoip/src/lib.rs +++ b/crates/tor-geoip/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-guardmgr/src/lib.rs b/crates/tor-guardmgr/src/lib.rs index 4f0d395d4..a981f356f 100644 --- a/crates/tor-guardmgr/src/lib.rs +++ b/crates/tor-guardmgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-guardmgr/src/sample.rs b/crates/tor-guardmgr/src/sample.rs index fbf73e93f..572a541fa 100644 --- a/crates/tor-guardmgr/src/sample.rs +++ b/crates/tor-guardmgr/src/sample.rs @@ -1140,7 +1140,7 @@ mod test { // Pick a guard and mark it as confirmed. let id1 = guards.sample[0].clone(); guards.record_success(&id1, ¶ms, None, t2); - assert_eq!(&guards.confirmed, &[id1.clone()]); + assert_eq!(&guards.confirmed, std::slice::from_ref(&id1)); // Encode the guards, then decode them. let state: GuardSample = (&guards).into(); @@ -1185,7 +1185,7 @@ mod test { // Pick a guard and mark it as confirmed. let id3 = guards.sample[3].clone(); guards.record_success(&id3, ¶ms, None, t2); - assert_eq!(&guards.confirmed, &[id3.clone()]); + assert_eq!(&guards.confirmed, std::slice::from_ref(&id3)); let id1 = guards.sample[1].clone(); guards.record_success(&id1, ¶ms, None, t3); assert_eq!(&guards.confirmed, &[id3.clone(), id1.clone()]); diff --git a/crates/tor-hsclient/src/lib.rs b/crates/tor-hsclient/src/lib.rs index f50f02518..995570cda 100644 --- a/crates/tor-hsclient/src/lib.rs +++ b/crates/tor-hsclient/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod connect; diff --git a/crates/tor-hscrypto/src/lib.rs b/crates/tor-hscrypto/src/lib.rs index 8edc9c2d5..156c22453 100644 --- a/crates/tor-hscrypto/src/lib.rs +++ b/crates/tor-hscrypto/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> #![allow(dead_code, unused_variables)] diff --git a/crates/tor-hsrproxy/src/lib.rs b/crates/tor-hsrproxy/src/lib.rs index bd27eb414..048ff339b 100644 --- a/crates/tor-hsrproxy/src/lib.rs +++ b/crates/tor-hsrproxy/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-hsservice/src/lib.rs b/crates/tor-hsservice/src/lib.rs index bc21d6cb8..511b2da96 100644 --- a/crates/tor-hsservice/src/lib.rs +++ b/crates/tor-hsservice/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-hsservice/src/time_store.rs b/crates/tor-hsservice/src/time_store.rs index 14ba5e7f1..31e4e77ce 100644 --- a/crates/tor-hsservice/src/time_store.rs +++ b/crates/tor-hsservice/src/time_store.rs @@ -161,7 +161,10 @@ define_derive_deftly! { s.parse().map_err(|e| E::custom(e)) } fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, concat!("string representing ", stringify!($tname))) + #[allow(clippy::useless_concat)] // False positive + { + write!(f, concat!("string representing ", stringify!($tname))) + } } } } diff --git a/crates/tor-key-forge/src/lib.rs b/crates/tor-key-forge/src/lib.rs index 4217ae8da..96422b09b 100644 --- a/crates/tor-key-forge/src/lib.rs +++ b/crates/tor-key-forge/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod certs; diff --git a/crates/tor-keymgr/src/lib.rs b/crates/tor-keymgr/src/lib.rs index c382ad529..1cf6a3b86 100644 --- a/crates/tor-keymgr/src/lib.rs +++ b/crates/tor-keymgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-linkspec/README.md b/crates/tor-linkspec/README.md index 3ec487d0a..01ca9bbbf 100644 --- a/crates/tor-linkspec/README.md +++ b/crates/tor-linkspec/README.md @@ -41,7 +41,7 @@ TODO: Possibly the link specifiers and the `*Target` traits belong in different ## Compile-time features * `pt-client` -- Build with enhanced data types to support pluggable - transports. + transports. * `full` -- Build with all the features above. diff --git a/crates/tor-linkspec/src/lib.rs b/crates/tor-linkspec/src/lib.rs index 1971b47c2..63e85599b 100644 --- a/crates/tor-linkspec/src/lib.rs +++ b/crates/tor-linkspec/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> #[cfg(feature = "decode")] diff --git a/crates/tor-llcrypto/src/lib.rs b/crates/tor-llcrypto/src/lib.rs index 5c861b13e..7f242764e 100644 --- a/crates/tor-llcrypto/src/lib.rs +++ b/crates/tor-llcrypto/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod cipher; diff --git a/crates/tor-log-ratelim/src/lib.rs b/crates/tor-log-ratelim/src/lib.rs index 3dcf4ea34..5a817e1a2 100644 --- a/crates/tor-log-ratelim/src/lib.rs +++ b/crates/tor-log-ratelim/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> /// Implementation notes diff --git a/crates/tor-memquota/src/lib.rs b/crates/tor-memquota/src/lib.rs index 8d039f26b..1a1de6308 100644 --- a/crates/tor-memquota/src/lib.rs +++ b/crates/tor-memquota/src/lib.rs @@ -216,6 +216,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1176 diff --git a/crates/tor-netdir/src/lib.rs b/crates/tor-netdir/src/lib.rs index eeb4181f4..b1049d049 100644 --- a/crates/tor-netdir/src/lib.rs +++ b/crates/tor-netdir/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod details; diff --git a/crates/tor-netdoc/src/lib.rs b/crates/tor-netdoc/src/lib.rs index a1ef88dab..d9ebf2397 100644 --- a/crates/tor-netdoc/src/lib.rs +++ b/crates/tor-netdoc/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-persist/src/lib.rs b/crates/tor-persist/src/lib.rs index 2983bfb7d..7420b172d 100644 --- a/crates/tor-persist/src/lib.rs +++ b/crates/tor-persist/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-proto/src/lib.rs b/crates/tor-proto/src/lib.rs index a5a620ae4..dd904c630 100644 --- a/crates/tor-proto/src/lib.rs +++ b/crates/tor-proto/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #2010: Remove this global allow, and either propagate it to the functions that need it, diff --git a/crates/tor-proto/src/tunnel/reactor.rs b/crates/tor-proto/src/tunnel/reactor.rs index a56b5ad4a..d128d05c7 100644 --- a/crates/tor-proto/src/tunnel/reactor.rs +++ b/crates/tor-proto/src/tunnel/reactor.rs @@ -1245,7 +1245,7 @@ impl Reactor { Ok(HopLocation::Hop((leg_id, hop))) } else if !self.circuits.is_empty() { // multi-path tunnel - return Ok(HopLocation::JoinPoint); + Ok(HopLocation::JoinPoint) } else { // no legs Err(NoHopsBuiltError) diff --git a/crates/tor-protover/src/lib.rs b/crates/tor-protover/src/lib.rs index 0984d3a50..d5942f8dc 100644 --- a/crates/tor-protover/src/lib.rs +++ b/crates/tor-protover/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> #![allow(non_upper_case_globals)] diff --git a/crates/tor-ptmgr/src/lib.rs b/crates/tor-ptmgr/src/lib.rs index af813481f..41bac82b3 100644 --- a/crates/tor-ptmgr/src/lib.rs +++ b/crates/tor-ptmgr/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod config; diff --git a/crates/tor-relay-crypto/src/lib.rs b/crates/tor-relay-crypto/src/lib.rs index 20463a537..6f191fe9a 100644 --- a/crates/tor-relay-crypto/src/lib.rs +++ b/crates/tor-relay-crypto/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod certs; diff --git a/crates/tor-relay-selection/src/lib.rs b/crates/tor-relay-selection/src/lib.rs index 72a9ff046..eb5e51a7f 100644 --- a/crates/tor-relay-selection/src/lib.rs +++ b/crates/tor-relay-selection/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod config; diff --git a/crates/tor-rpc-connect/src/lib.rs b/crates/tor-rpc-connect/src/lib.rs index 6c9e8b80c..eaefacbff 100644 --- a/crates/tor-rpc-connect/src/lib.rs +++ b/crates/tor-rpc-connect/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-rpcbase/src/dispatch.rs b/crates/tor-rpcbase/src/dispatch.rs index c8fb94957..878ae3d4a 100644 --- a/crates/tor-rpcbase/src/dispatch.rs +++ b/crates/tor-rpcbase/src/dispatch.rs @@ -312,7 +312,7 @@ pub struct InvokerEnt { /// /// Always present. #[doc(hidden)] - pub invoker: &'static (dyn Invocable), + pub invoker: &'static dyn Invocable, /// The same function as `invoker`, but only if that function implements /// `RpcInvocable` @@ -320,7 +320,7 @@ pub struct InvokerEnt { /// This will be `None` if this is a "special" method--that is, one whose inputs and outputs are not serializable, /// and which is therefore not invocable directly from an RPC connection. #[doc(hidden)] - pub rpc_invoker: Option<&'static (dyn RpcInvocable)>, + pub rpc_invoker: Option<&'static dyn RpcInvocable>, // These fields are used to make sure that we aren't installing different // functions for the same (Object, Method) pair. diff --git a/crates/tor-rpcbase/src/lib.rs b/crates/tor-rpcbase/src/lib.rs index fe07e8708..89896ef58 100644 --- a/crates/tor-rpcbase/src/lib.rs +++ b/crates/tor-rpcbase/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> pub mod dispatch; diff --git a/crates/tor-rtcompat/src/lib.rs b/crates/tor-rtcompat/src/lib.rs index 1481ee92e..c31faff8c 100644 --- a/crates/tor-rtcompat/src/lib.rs +++ b/crates/tor-rtcompat/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-rtcompat/src/opaque.rs b/crates/tor-rtcompat/src/opaque.rs index 01deeee0d..ebc6c1215 100644 --- a/crates/tor-rtcompat/src/opaque.rs +++ b/crates/tor-rtcompat/src/opaque.rs @@ -120,6 +120,7 @@ macro_rules! implement_opaque_runtime { } // This boilerplate will fail unless $t implements Runtime. + #[allow(unused)] const _ : () = { fn assert_runtime<R: $crate::Runtime>() {} fn check() { diff --git a/crates/tor-rtmock/src/lib.rs b/crates/tor-rtmock/src/lib.rs index c460d48bc..7d62bae9b 100644 --- a/crates/tor-rtmock/src/lib.rs +++ b/crates/tor-rtmock/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // TODO #1645 (either remove this, or decide to have it everywhere) diff --git a/crates/tor-rtmock/src/util.rs b/crates/tor-rtmock/src/util.rs index a7871788f..cc7be1b71 100644 --- a/crates/tor-rtmock/src/util.rs +++ b/crates/tor-rtmock/src/util.rs @@ -155,6 +155,7 @@ define_derive_deftly! { ) // TODO this wants to be assert_impl but it fails at generics + #[allow(unused)] const _: fn() = || { fn x(_: impl Runtime) { } fn check_impl_runtime<$tgens>(t: $ttype) { x(t) } diff --git a/crates/tor-socksproto/src/lib.rs b/crates/tor-socksproto/src/lib.rs index 4e75930af..7a942a2dd 100644 --- a/crates/tor-socksproto/src/lib.rs +++ b/crates/tor-socksproto/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> mod err; diff --git a/crates/tor-units/src/lib.rs b/crates/tor-units/src/lib.rs index 94270a85d..3c92da045 100644 --- a/crates/tor-units/src/lib.rs +++ b/crates/tor-units/src/lib.rs @@ -41,6 +41,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> use derive_more::{Add, Display, Div, From, FromStr, Mul}; diff --git a/maint/add_warning b/maint/add_warning index 37db20668..b766a8cdd 100755 --- a/maint/add_warning +++ b/maint/add_warning @@ -56,6 +56,7 @@ WANT_LINTS = """ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 """ # ---------- list of lints to apply or disapply *in tests* ---------- diff --git a/maint/fixup-features/src/graph.rs b/maint/fixup-features/src/graph.rs index 851be62c9..0b1b28662 100644 --- a/maint/fixup-features/src/graph.rs +++ b/maint/fixup-features/src/graph.rs @@ -44,6 +44,7 @@ #![allow(clippy::result_large_err)] // temporary workaround for arti#587 #![allow(clippy::needless_raw_string_hashes)] // complained-about code is fine, often best #![allow(clippy::needless_lifetimes)] // See arti#1765 +#![allow(mismatched_lifetime_syntaxes)] // temporary workaround for arti#2060 //! <!-- @@ end lint list maintained by maint/add_warning @@ --> // @@ begin test lint list maintained by maint/add_warning @@ |