bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_error: make ErrorReported impossible to construct

Browse source 
There are a few places were we have to construct it, though, and a few
places that are more invasive to change. To do this, we create a
constructor with a long obvious name.
This commit is contained in:
mark 2022-01-22 18:49:12 -06:00
parent 461e807801
commit bb8d4307eb
104 changed files with 705 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_incremental/src/persist/fs.rs
View file

@ -225,12 +225,12 @@ pub fn prepare_session_directory(
let crate_dir = match crate_dir.canonicalize() {
Ok(v) => v,
Err(err) => {
sess.err(&format!(
let reported = sess.err(&format!(
"incremental compilation: error canonicalizing path `{}`: {}",
crate_dir.display(),
err
));
return Err(ErrorGuaranteed);
return Err(reported);
}
};
@ -489,14 +489,14 @@ fn create_dir(sess: &Session, path: &Path, dir_tag: &str) -> Result<(), ErrorGua
Ok(())
}
Err(err) => {
sess.err(&format!(
let reported = sess.err(&format!(
"Could not create incremental compilation {} \
directory `{}`: {}",
dir_tag,
path.display(),
err
));
Err(ErrorGuaranteed)
Err(reported)
}
}
}
@ -545,8 +545,7 @@ fn lock_directory(
);
}
}
err.emit();
Err(ErrorGuaranteed)
Err(err.emit())
}
}
}