diff --git a/src/cmd/luau.rs b/src/cmd/luau.rs index 5835a7eef..c5264c8e6 100644 --- a/src/cmd/luau.rs +++ b/src/cmd/luau.rs @@ -1395,17 +1395,14 @@ fn beginend_insertrecord( headers_count: usize, wtr: &mut csv::Writer>, ) -> Result<(), CliError> { - match luau.globals().raw_get(QSV_INSERTRECORD_TBL) { - Ok(Value::Table(insertrecord_table)) => { - // QSV_INSERTRECORD_TBL is populated, we have a record to insert - insertrecord.clear(); + if let Ok(Value::Table(insertrecord_table)) = luau.globals().raw_get(QSV_INSERTRECORD_TBL) { + // QSV_INSERTRECORD_TBL is populated, we have a record to insert + insertrecord.clear(); - create_insertrecord(&insertrecord_table, insertrecord, headers_count)?; + create_insertrecord(&insertrecord_table, insertrecord, headers_count)?; - wtr.write_record(&*insertrecord)?; - insertrecord_table.clear()?; - }, - Ok(_) | Err(_) => {}, + wtr.write_record(&*insertrecord)?; + insertrecord_table.clear()?; } Ok(()) } diff --git a/src/cmd/snappy.rs b/src/cmd/snappy.rs index cd36ad2ba..87bbae73b 100644 --- a/src/cmd/snappy.rs +++ b/src/cmd/snappy.rs @@ -101,42 +101,39 @@ pub fn run(argv: &[&str]) -> CliResult<()> { // this is automatically deleted when temp_download goes out of scope let temp_download = NamedTempFile::new()?; - let input_reader: Box = match &args.arg_input { - Some(uri) => { - let path = if Url::parse(uri).is_ok() && uri.starts_with("http") { - // its a remote file, download it first - let future = util::download_file( - uri, - temp_download.path().to_path_buf(), - args.flag_progressbar && !args.cmd_check && !args.flag_quiet, - args.flag_user_agent, - Some(args.flag_timeout), - if args.cmd_check { - Some(50) // only download 50 bytes when checking for a snappy header - } else { - None - }, - ); - tokio::runtime::Runtime::new()?.block_on(future)?; - // safety: temp_download is a NamedTempFile, so we know that it can be converted - let temp_download_path = temp_download.path().to_str().unwrap().to_string(); - temp_download_path - } else { - // its a local file - uri.to_string() - }; + let input_reader: Box = if let Some(uri) = &args.arg_input { + let path = if Url::parse(uri).is_ok() && uri.starts_with("http") { + // its a remote file, download it first + let future = util::download_file( + uri, + temp_download.path().to_path_buf(), + args.flag_progressbar && !args.cmd_check && !args.flag_quiet, + args.flag_user_agent, + Some(args.flag_timeout), + if args.cmd_check { + Some(50) // only download 50 bytes when checking for a snappy header + } else { + None + }, + ); + tokio::runtime::Runtime::new()?.block_on(future)?; + // safety: temp_download is a NamedTempFile, so we know that it can be converted + let temp_download_path = temp_download.path().to_str().unwrap().to_string(); + temp_download_path + } else { + // its a local file + uri.to_string() + }; - let file = fs::File::open(path)?; - input_bytes = file.metadata()?.len(); - Box::new(io::BufReader::with_capacity( - config::DEFAULT_RDR_BUFFER_CAPACITY, - file, - )) - }, - None => { - input_bytes = 0; - Box::new(io::BufReader::new(stdin().lock())) - }, + let file = fs::File::open(path)?; + input_bytes = file.metadata()?.len(); + Box::new(io::BufReader::with_capacity( + config::DEFAULT_RDR_BUFFER_CAPACITY, + file, + )) + } else { + input_bytes = 0; + Box::new(io::BufReader::new(stdin().lock())) }; let output_writer: Box = match &args.flag_output {