Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 9de2e50

Browse files
committedApr 26, 2025·
Auto merge of rust-lang#140315 - matthiaskrgr:rollup-tmb35n8, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#139865 (Stabilize proc_macro::Span::{start,end,line,column}.) - rust-lang#140086 (If creating a temporary directory fails with permission denied then retry with backoff) - rust-lang#140216 (Document that "extern blocks must be unsafe" in Rust 2024) - rust-lang#140220 (Fix detection of main function if there are expressions around it) - rust-lang#140253 (Add XtensaAsmPrinter) - rust-lang#140272 (Improve error message for `||` (or) in let chains) - rust-lang#140305 (Track per-obligation recursion depth only if there is inference in the new solver) - rust-lang#140306 (handle specialization in the new trait solver) - rust-lang#140308 (stall generator witness obligations: add regression test) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 555e1d0 + c007219 commit 9de2e50

File tree

50 files changed

+576
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+576
-170
lines changed
 

‎Cargo.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3699,6 +3699,9 @@ dependencies = [
36993699
[[package]]
37003700
name = "rustc_fs_util"
37013701
version = "0.0.0"
3702+
dependencies = [
3703+
"tempfile",
3704+
]
37023705

37033706
[[package]]
37043707
name = "rustc_graphviz"
@@ -4011,7 +4014,6 @@ dependencies = [
40114014
"rustc_session",
40124015
"rustc_span",
40134016
"rustc_target",
4014-
"tempfile",
40154017
"tracing",
40164018
]
40174019

‎compiler/rustc_codegen_ssa/src/back/archive.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ use object::read::archive::ArchiveFile;
1313
use object::read::macho::FatArch;
1414
use rustc_data_structures::fx::FxIndexSet;
1515
use rustc_data_structures::memmap::Mmap;
16+
use rustc_fs_util::TempDirBuilder;
1617
use rustc_session::Session;
1718
use rustc_span::Symbol;
18-
use tempfile::Builder as TempFileBuilder;
1919
use tracing::trace;
2020

2121
use super::metadata::search_for_section;
@@ -501,7 +501,7 @@ impl<'a> ArArchiveBuilder<'a> {
501501
// it creates. We need it to be the default mode for back compat reasons however. (See
502502
// #107495) To handle this we are telling tempfile to create a temporary directory instead
503503
// and then inside this directory create a file using File::create.
504-
let archive_tmpdir = TempFileBuilder::new()
504+
let archive_tmpdir = TempDirBuilder::new()
505505
.suffix(".temp-archive")
506506
.tempdir_in(output.parent().unwrap_or_else(|| Path::new("")))
507507
.map_err(|err| {

0 commit comments

Comments
 (0)
This repository has been archived.