mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused field from IncrCompSession.

Browse Source
This commit is contained in:
Nicholas Nethercote 2023-11-30 11:54:32 +11:00
parent 4b90b26fd8
commit e065d96b08
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_incremental/src/persist/fs.rs
View File

@ -262,7 +262,7 @@ pub(crate) fn prepare_session_directory(
directory." directory."
); );
sess.init_incr_comp_session(session_dir, directory_lock, false); sess.init_incr_comp_session(session_dir, directory_lock);
return Ok(()); return Ok(());
}; };
@ -276,7 +276,7 @@ pub(crate) fn prepare_session_directory(
sess.emit_warning(errors::HardLinkFailed { path: &session_dir }); sess.emit_warning(errors::HardLinkFailed { path: &session_dir });
} }
sess.init_incr_comp_session(session_dir, directory_lock, true); sess.init_incr_comp_session(session_dir, directory_lock);
return Ok(()); return Ok(());
} else { } else {
debug!("copying failed - trying next directory"); debug!("copying failed - trying next directory");

12
compiler/rustc_session/src/session.rs
View File

@ -814,12 +814,7 @@ pub fn get_tools_search_paths(&self, self_contained: bool) -> Vec<PathBuf> {
if self_contained { vec![p.clone(), p.join("self-contained")] } else { vec![p] } if self_contained { vec![p.clone(), p.join("self-contained")] } else { vec![p] }
} }
pub fn init_incr_comp_session( pub fn init_incr_comp_session(&self, session_dir: PathBuf, lock_file: flock::Lock) {
&self,
session_dir: PathBuf,
lock_file: flock::Lock,
load_dep_graph: bool,
) {
let mut incr_comp_session = self.incr_comp_session.borrow_mut(); let mut incr_comp_session = self.incr_comp_session.borrow_mut();
if let IncrCompSession::NotInitialized = *incr_comp_session { if let IncrCompSession::NotInitialized = *incr_comp_session {
@ -827,8 +822,7 @@ pub fn init_incr_comp_session(
panic!("Trying to initialize IncrCompSession `{:?}`", *incr_comp_session) panic!("Trying to initialize IncrCompSession `{:?}`", *incr_comp_session)
} }
*incr_comp_session = *incr_comp_session = IncrCompSession::Active { session_directory: session_dir, lock_file };
IncrCompSession::Active { session_directory: session_dir, lock_file, load_dep_graph };
} }
pub fn finalize_incr_comp_session(&self, new_directory_path: PathBuf) { pub fn finalize_incr_comp_session(&self, new_directory_path: PathBuf) {
@ -1686,7 +1680,7 @@ enum IncrCompSession {
NotInitialized, NotInitialized,
/// This is the state during which the session directory is private and can /// This is the state during which the session directory is private and can
/// be modified. /// be modified.
Active { session_directory: PathBuf, lock_file: flock::Lock, load_dep_graph: bool }, Active { session_directory: PathBuf, lock_file: flock::Lock },
/// This is the state after the session directory has been finalized. In this /// This is the state after the session directory has been finalized. In this
/// state, the contents of the directory must not be modified any more. /// state, the contents of the directory must not be modified any more.
Finalized { session_directory: PathBuf }, Finalized { session_directory: PathBuf },