bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename {create,emit}_warning as {create,emit}_warn.

Browse source 
For consistency with `warn`/`struct_warn`, and also `{create,emit}_err`,
all of which use an abbreviated form.
This commit is contained in:
Nicholas Nethercote 2024-01-04 11:28:14 +11:00
parent ff40ad4107
commit 3c4f1d85af
23 changed files with 55 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,7 +273,7 @@ pub(crate) fn prepare_session_directory(
debug!("successfully copied data from: {}", source_directory.display());
if !allows_links {
sess.dcx().emit_warning(errors::HardLinkFailed { path: &session_dir });
sess.dcx().emit_warn(errors::HardLinkFailed { path: &session_dir });
}
sess.init_incr_comp_session(session_dir, directory_lock);
@ -288,7 +288,7 @@ pub(crate) fn prepare_session_directory(
// Try to remove the session directory we just allocated. We don't
// know if there's any garbage in it from the failed copy action.
if let Err(err) = safe_remove_dir_all(&session_dir) {
sess.dcx().emit_warning(errors::DeletePartial { path: &session_dir, err });
sess.dcx().emit_warn(errors::DeletePartial { path: &session_dir, err });
}
delete_session_dir_lock_file(sess, &lock_file_path);
@ -322,7 +322,7 @@ pub fn finalize_session_directory(sess: &Session, svh: Option<Svh>) {
);
if let Err(err) = safe_remove_dir_all(&*incr_comp_session_dir) {
sess.dcx().emit_warning(errors::DeleteFull { path: &incr_comp_session_dir, err });
sess.dcx().emit_warn(errors::DeleteFull { path: &incr_comp_session_dir, err });
}
let lock_file_path = lock_file_path(&*incr_comp_session_dir);
@ -365,7 +365,7 @@ pub fn finalize_session_directory(sess: &Session, svh: Option<Svh>) {
}
Err(e) => {
// Warn about the error. However, no need to abort compilation now.
sess.dcx().emit_warning(errors::Finalize { path: &incr_comp_session_dir, err: e });
sess.dcx().emit_warn(errors::Finalize { path: &incr_comp_session_dir, err: e });
debug!("finalize_session_directory() - error, marking as invalid");
// Drop the file lock, so we can garage collect
@ -500,7 +500,7 @@ fn lock_directory(
fn delete_session_dir_lock_file(sess: &Session, lock_file_path: &Path) {
if let Err(err) = safe_remove_file(lock_file_path) {
sess.dcx().emit_warning(errors::DeleteLock { path: lock_file_path, err });
sess.dcx().emit_warn(errors::DeleteLock { path: lock_file_path, err });
}
}
@ -724,7 +724,7 @@ pub(crate) fn garbage_collect_session_directories(sess: &Session) -> io::Result<
if !lock_file_to_session_dir.items().any(|(_, dir)| *dir == directory_name) {
let path = crate_directory.join(directory_name);
if let Err(err) = safe_remove_dir_all(&path) {
sess.dcx().emit_warning(errors::InvalidGcFailed { path: &path, err });
sess.dcx().emit_warn(errors::InvalidGcFailed { path: &path, err });
}
}
}
@ -830,7 +830,7 @@ pub(crate) fn garbage_collect_session_directories(sess: &Session) -> io::Result<
debug!("garbage_collect_session_directories() - deleting `{}`", path.display());
if let Err(err) = safe_remove_dir_all(&path) {
sess.dcx().emit_warning(errors::FinalizedGcFailed { path: &path, err });
sess.dcx().emit_warn(errors::FinalizedGcFailed { path: &path, err });
} else {
delete_session_dir_lock_file(sess, &lock_file_path(&path));
}
@ -848,7 +848,7 @@ fn delete_old(sess: &Session, path: &Path) {
debug!("garbage_collect_session_directories() - deleting `{}`", path.display());
if let Err(err) = safe_remove_dir_all(path) {
sess.dcx().emit_warning(errors::SessionGcFailed { path: path, err });
sess.dcx().emit_warn(errors::SessionGcFailed { path: path, err });
} else {
delete_session_dir_lock_file(sess, &lock_file_path(path));
}

2
compiler/rustc_incremental/src/persist/load.rs
View file

@ -51,7 +51,7 @@ impl<T: Default> LoadResult<T> {
match self {
LoadResult::LoadDepGraph(path, err) => {
sess.dcx().emit_warning(errors::LoadDepGraph { path, err });
sess.dcx().emit_warn(errors::LoadDepGraph { path, err });
Default::default()
}
LoadResult::DataOutOfDate => {

4
compiler/rustc_incremental/src/persist/work_product.rs
View file

@ -30,7 +30,7 @@ pub fn copy_cgu_workproduct_to_incr_comp_cache_dir(
let _ = saved_files.insert(ext.to_string(), file_name);
}
Err(err) => {
sess.dcx().emit_warning(errors::CopyWorkProductToCache {
sess.dcx().emit_warn(errors::CopyWorkProductToCache {
from: path,
to: &path_in_incr_dir,
err,
@ -50,7 +50,7 @@ pub(crate) fn delete_workproduct_files(sess: &Session, work_product: &WorkProduc
for (_, path) in work_product.saved_files.items().into_sorted_stable_ord() {
let path = in_incr_comp_dir_sess(sess, path);
if let Err(err) = std_fs::remove_file(&path) {
sess.dcx().emit_warning(errors::DeleteWorkProduct { path: &path, err });
sess.dcx().emit_warn(errors::DeleteWorkProduct { path: &path, err });
}
}
}