vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nightly-warnings-20230822' into 'main' 

Fix a few warnings from nightly clippy

See merge request tpo/core/arti!1533
This commit is contained in:
Nick Mathewson 2023-08-22 17:01:05 +00:00
parent d633efc28b 7f44281725
commit 2d50ffb0a7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/arti-client/src/client.rs
View File

@ -1023,8 +1023,8 @@ impl<R: Runtime> TorClient<R> {
if let Some(keymgr) = &self.keymgr { if let Some(keymgr) = &self.keymgr {
// TODO hs: use a real client id (loaded from the config) // TODO hs: use a real client id (loaded from the config)
let client_id = HsClientSpecifier::new("default".into()) let client_id =
.map_err(|e| ErrorDetail::Keystore(e))?; HsClientSpecifier::new("default".into()).map_err(ErrorDetail::Keystore)?;
let desc_enc_key_spec = HsClientSecretKeySpecifier::new( let desc_enc_key_spec = HsClientSecretKeySpecifier::new(
client_id.clone(), client_id.clone(),
hsid, hsid,

9
crates/arti/src/cfg.rs
View File

@ -289,6 +289,7 @@ mod test {
use itertools::{chain, EitherOrBoth, Itertools}; use itertools::{chain, EitherOrBoth, Itertools};
use regex::Regex; use regex::Regex;
use std::collections::HashSet; use std::collections::HashSet;
use std::fmt::Write as _;
use std::iter; use std::iter;
use std::time::Duration; use std::time::Duration;
use tor_config::load::{ConfigResolveError, ResolutionResults}; use tor_config::load::{ConfigResolveError, ResolutionResults};
@ -639,10 +640,10 @@ mod test {
.collect_vec(); .collect_vec();
if !reports.is_empty() { if !reports.is_empty() {
let reports = reports let reports = reports.iter().fold(String::new(), |mut out, (k, s)| {
.iter() writeln!(out, " {}: {}", s, k).unwrap();
.map(|(k, s)| format!(" {}: {}\n", s, k)) out
.collect::<String>(); });
panic!( panic!(
r" r"

2
crates/tor-chanmgr/src/factory.rs
View File

@ -160,7 +160,7 @@ impl ChannelFactory for CompoundFactory {
Some(mgr) => mgr Some(mgr) => mgr
.factory_for_transport(a.transport()) .factory_for_transport(a.transport())
.await .await
.map_err(|e| crate::Error::Pt(e))? .map_err(crate::Error::Pt)?
.ok_or_else(|| crate::Error::NoSuchTransport(a.transport().clone().into()))?, .ok_or_else(|| crate::Error::NoSuchTransport(a.transport().clone().into()))?,
None => return Err(crate::Error::NoSuchTransport(a.transport().clone().into())), None => return Err(crate::Error::NoSuchTransport(a.transport().clone().into())),
}, },