From 48e39630f580c8eaa06629271b75e17535e420c6 Mon Sep 17 00:00:00 2001 From: Benjy Weinberger Date: Thu, 10 Sep 2020 21:41:38 -0700 Subject: [PATCH] Simplify file reading # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels] --- src/rust/engine/src/context.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/rust/engine/src/context.rs b/src/rust/engine/src/context.rs index 1648803b1f6c..024da731bc65 100644 --- a/src/rust/engine/src/context.rs +++ b/src/rust/engine/src/context.rs @@ -266,16 +266,13 @@ impl Core { // These certs are for downloads, not to be confused with the ones used for remoting. let ca_certs = if let Some(ref path) = ca_certs_path { - let mut buf = Vec::new(); + let mut content = String::new(); std::fs::File::open(path) - .and_then(|mut f| f.read_to_end(&mut buf)) + .and_then(|mut f| f.read_to_string(&mut content)) .map_err(|err| format!("Error reading root CA certs file {:?}: {}", path, err))?; - let content = std::str::from_utf8(&buf) - .map_err(|err| format!("Error decoding root CA certs file {:?}: {}", path, err))?; - let pem_re = Regex::new(PEM_RE_STR).unwrap(); let certs_res: Result, _> = pem_re - .find_iter(content) + .find_iter(&content) .map(|mat| reqwest::Certificate::from_pem(mat.as_str().as_bytes())) .collect(); certs_res.map_err(|err| {