Skip to content

Commit e4c23da

Browse files
committed
Auto merge of #90731 - pierwill:fix-90658, r=michaelwoerister
Remove `rustc_incremental::persist::fs::dep_graph_path_from` Closes #90658. r? `@michaelwoerister`
2 parents 14a2fd6 + 6f13bdb commit e4c23da

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

compiler/rustc_incremental/src/persist/fs.rs

-3
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,6 @@ pub fn dep_graph_path(sess: &Session) -> PathBuf {
139139
pub fn staging_dep_graph_path(sess: &Session) -> PathBuf {
140140
in_incr_comp_dir_sess(sess, STAGING_DEP_GRAPH_FILENAME)
141141
}
142-
pub fn dep_graph_path_from(incr_comp_session_dir: &Path) -> PathBuf {
143-
in_incr_comp_dir(incr_comp_session_dir, DEP_GRAPH_FILENAME)
144-
}
145142

146143
pub fn work_products_path(sess: &Session) -> PathBuf {
147144
in_incr_comp_dir_sess(sess, WORK_PRODUCTS_FILENAME)

compiler/rustc_incremental/src/persist/load.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub fn load_dep_graph(sess: &Session) -> DepGraphFuture {
105105

106106
// Calling `sess.incr_comp_session_dir()` will panic if `sess.opts.incremental.is_none()`.
107107
// Fortunately, we just checked that this isn't the case.
108-
let path = dep_graph_path_from(&sess.incr_comp_session_dir());
108+
let path = dep_graph_path(&sess);
109109
let report_incremental_info = sess.opts.debugging_opts.incremental_info;
110110
let expected_hash = sess.opts.dep_tracking_hash(false);
111111

0 commit comments

Comments
 (0)