rust/rustls
rust
/
rustls
mirror of https://github.com/ctz/rustls
1
0
Fork 0
Code Issues Releases Wiki Activity

examples: use inline variable names in format strings

This commit is contained in:
Dirkjan Ochtman 2023-01-16 10:44:08 +01:00
parent 6dfa67809d
commit 38eedb5ea9
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/src/bin/simple_0rtt_client.rs
View File

@ -10,15 +10,14 @@ fn start_connection(config: &Arc<rustls::ClientConfig>, domain_name: &str) {
.try_into() .try_into()
.expect("invalid DNS name"); .expect("invalid DNS name");
let mut conn = rustls::ClientConnection::new(Arc::clone(config), server_name).unwrap(); let mut conn = rustls::ClientConnection::new(Arc::clone(config), server_name).unwrap();
let mut sock = TcpStream::connect(format!("{}:443", domain_name)).unwrap(); let mut sock = TcpStream::connect(format!("{domain_name}:443")).unwrap();
sock.set_nodelay(true).unwrap(); sock.set_nodelay(true).unwrap();
let request = format!( let request = format!(
"GET / HTTP/1.1\r\n\ "GET / HTTP/1.1\r\n\
Host: {}\r\n\ Host: {domain_name}\r\n\
Connection: close\r\n\ Connection: close\r\n\
Accept-Encoding: identity\r\n\ Accept-Encoding: identity\r\n\
\r\n", \r\n",
domain_name
); );
// If early data is available with this server, then early_data() // If early data is available with this server, then early_data()

14
examples/src/bin/tlsclient-mio.rs
View File

@ -101,7 +101,7 @@ impl TlsClient {
let io_state = match self.tls_conn.process_new_packets() { let io_state = match self.tls_conn.process_new_packets() {
Ok(io_state) => io_state, Ok(io_state) => io_state,
Err(err) => { Err(err) => {
println!("TLS error: {:?}", err); println!("TLS error: {err:?}");
self.closing = true; self.closing = true;
return; return;
} }
@ -373,7 +373,7 @@ fn lookup_suites(suites: &[String]) -> Vec<rustls::SupportedCipherSuite> {
let scs = find_suite(csname); let scs = find_suite(csname);
match scs { match scs {
Some(s) => out.push(s), Some(s) => out.push(s),
None => panic!("cannot look up ciphersuite '{}'", csname), None => panic!("cannot look up ciphersuite '{csname}'"),
} }
} }
@ -388,10 +388,7 @@ fn lookup_versions(versions: &[String]) -> Vec<&'static rustls::SupportedProtoco
let version = match vname.as_ref() { let version = match vname.as_ref() {
"1.2" => &rustls::version::TLS12, "1.2" => &rustls::version::TLS12,
"1.3" => &rustls::version::TLS13, "1.3" => &rustls::version::TLS13,
_ => panic!( _ => panic!("cannot look up version '{vname}', valid are '1.2' and '1.3'",),
"cannot look up version '{}', valid are '1.2' and '1.3'",
vname
),
}; };
out.push(version); out.push(version);
} }
@ -423,10 +420,7 @@ fn load_private_key(filename: &str) -> rustls::PrivateKey {
} }
} }
panic!( panic!("no keys found in {filename:?} (encrypted keys not supported)",);
"no keys found in {:?} (encrypted keys not supported)",
filename
);
} }
#[cfg(feature = "dangerous_configuration")] #[cfg(feature = "dangerous_configuration")]

10
examples/src/bin/tlsserver-mio.rs
View File

@ -79,10 +79,7 @@ impl TlsServer {
} }
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => return Ok(()), Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => return Ok(()),
Err(err) => { Err(err) => {
println!( println!("encountered error while accepting connection; err={err:?}",);
"encountered error while accepting connection; err={:?}",
err
);
return Err(err); return Err(err);
} }
} }
@ -497,10 +494,7 @@ fn lookup_versions(versions: &[String]) -> Vec<&'static rustls::SupportedProtoco
let version = match vname.as_ref() { let version = match vname.as_ref() {
"1.2" => &rustls::version::TLS12, "1.2" => &rustls::version::TLS12,
"1.3" => &rustls::version::TLS13, "1.3" => &rustls::version::TLS13,
_ => panic!( _ => panic!("cannot look up version '{vname}', valid are '1.2' and '1.3'",),
"cannot look up version '{}', valid are '1.2' and '1.3'",
vname
),
}; };
out.push(version); out.push(version);
} }