rust: event reader error message revisited

This commit is contained in:
Laszlo Nagy
2024-09-26 12:16:39 +00:00
parent 482967802e
commit b991249a88

View File

@@ -173,10 +173,12 @@ impl Application {
semantic_transform, semantic_transform,
output_writer, output_writer,
} => { } => {
// Set up the pipeline of compilation database entries.
let entries = event_source let entries = event_source
.generate() .generate()
.flat_map(|execution| semantic_recognition.recognize(execution)) .flat_map(|execution| semantic_recognition.recognize(execution))
.flat_map(|semantic| semantic_transform.into_entries(semantic)); .flat_map(|semantic| semantic_transform.into_entries(semantic));
// Consume the entries and write them to the output file.
// The exit code is based on the result of the output writer. // The exit code is based on the result of the output writer.
match output_writer.run(entries) { match output_writer.run(entries) {
Ok(_) => ExitCode::SUCCESS, Ok(_) => ExitCode::SUCCESS,
@@ -202,7 +204,6 @@ impl Application {
/// Here we only handle the file opening and the error handling. /// Here we only handle the file opening and the error handling.
struct EventFileReader { struct EventFileReader {
reader: BufReader<File>, reader: BufReader<File>,
file_name: PathBuf,
} }
impl TryFrom<BuildEvents> for EventFileReader { impl TryFrom<BuildEvents> for EventFileReader {
@@ -216,10 +217,10 @@ impl TryFrom<BuildEvents> for EventFileReader {
let file = OpenOptions::new() let file = OpenOptions::new()
.read(true) .read(true)
.open(file_name.as_path()) .open(file_name.as_path())
.with_context(|| format!("Failed to open file: {:?}", file_name))?; .with_context(|| format!("Failed to open input file: {:?}", file_name))?;
let reader = BufReader::new(file); let reader = BufReader::new(file);
Ok(EventFileReader { reader, file_name }) Ok(EventFileReader { reader })
} }
} }
@@ -235,8 +236,7 @@ impl EventFileReader {
.flat_map(|candidate| match candidate { .flat_map(|candidate| match candidate {
Ok(execution) => Some(execution), Ok(execution) => Some(execution),
Err(error) => { Err(error) => {
// FIXME: write the file name to the log. log::warn!("Failed to read entry from input: {}", error);
log::warn!("Failed to read entry: {}", error);
None None
} }
}) })