address final review nits

Signed-off-by: Rajat Jindal <[email protected]>

Author: rajatjindal

crates/trigger-http/src/tls.rs

@@ -42,10 +42,10 @@ pub fn load_certs(
             )
         },
     )?))
-    .collect::<io::Result<Vec<rustls_pki_types::CertificateDer<'static>>>>()
+    .collect()
 }
 
-// load_keys parse and return the first private key from the provided file
+// parse and return the first private key from the provided file
 pub fn load_key(path: impl AsRef<Path>) -> io::Result<rustls_pki_types::PrivateKeyDer<'static>> {
     private_key(&mut io::BufReader::new(fs::File::open(path).map_err(
         |err| {

crates/trigger/src/runtime_config.rs

@@ -198,14 +198,14 @@ impl RuntimeConfig {
             existing_opts: Option<&HashMap<Authority, ParsedClientTlsOpts>>,
             host: Authority,
             newopts: ParsedClientTlsOpts,
-        ) -> Option<(Authority, ParsedClientTlsOpts)> {
+        ) -> (Authority, ParsedClientTlsOpts) {
             match existing_opts {
-                None => Some((host, newopts.clone())),
+                None => (host, newopts),
                 Some(opts) => match opts.get(&host) {
                     Some(existing_opts_for_component_and_host) => {
-                        Some((host, existing_opts_for_component_and_host.to_owned()))
+                        (host, existing_opts_for_component_and_host.to_owned())
                     }
-                    None => Some((host, newopts.clone())),
+                    None => (host, newopts),
                 },
             }
         }
@@ -214,21 +214,21 @@ impl RuntimeConfig {
             for opts in &opt_layer.client_tls_opts {
                 let parsed = parse_client_tls_opts(opts).context("parsing client tls options")?;
                 for component_id in &opts.component_ids {
-                    let existing_opts_for_component = components_map.get(&component_id.to_string());
+                    let existing_opts_for_component = components_map.get(component_id.as_ref());
                     #[allow(clippy::mutable_key_type)]
                     let hostmap = parsed
                         .hosts
                         .clone()
                         .into_iter()
-                        .filter_map(|host| {
+                        .map(|host| {
                             use_existing_if_available(
                                 existing_opts_for_component,
                                 host,
                                 parsed.clone(),
                             )
                         })
                         .collect::<HashMap<Authority, ParsedClientTlsOpts>>();
-                    components_map.insert(component_id.to_string().to_owned(), hostmap);
+                    components_map.insert(component_id.to_string(), hostmap);
                 }
             }
         }