Skip to content

Commit a5466fc

Browse files
authored
Rollup merge of rust-lang#85911 - cjgillot:one-output, r=Aaron1011
Avoid a clone of output_filenames. Part of rust-lang#85153
2 parents ad7b56e + ba0ac88 commit a5466fc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/rustc_interface/src/passes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ pub fn create_global_ctxt<'tcx>(
799799
query_result_on_disk_cache,
800800
queries.as_dyn(),
801801
&crate_name,
802-
&outputs,
802+
outputs,
803803
)
804804
})
805805
});

compiler/rustc_middle/src/ty/context.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,7 @@ impl<'tcx> TyCtxt<'tcx> {
11351135
on_disk_cache: Option<query::OnDiskCache<'tcx>>,
11361136
queries: &'tcx dyn query::QueryEngine<'tcx>,
11371137
crate_name: &str,
1138-
output_filenames: &OutputFilenames,
1138+
output_filenames: OutputFilenames,
11391139
) -> GlobalCtxt<'tcx> {
11401140
let data_layout = TargetDataLayout::parse(&s.target).unwrap_or_else(|err| {
11411141
s.fatal(&err);
@@ -1179,7 +1179,7 @@ impl<'tcx> TyCtxt<'tcx> {
11791179
stability_interner: Default::default(),
11801180
const_stability_interner: Default::default(),
11811181
alloc_map: Lock::new(interpret::AllocMap::new()),
1182-
output_filenames: Arc::new(output_filenames.clone()),
1182+
output_filenames: Arc::new(output_filenames),
11831183
main_def: resolutions.main_def,
11841184
}
11851185
}

0 commit comments

Comments
 (0)