diff options
Diffstat (limited to 'crates/tor-proto')
| -rw-r--r-- | crates/tor-proto/src/lib.rs | 1 | ||||
| -rw-r--r-- | crates/tor-proto/src/tunnel/reactor.rs | 2 |
2 files changed, 2 insertions, 1 deletions
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) |