Skip to content

Commit 595d86b

Browse files
authored
Unrolled build for #145774
Rollup merge of #145774 - Shourya742:2025-08-23-remove-default-opts-method, r=Kobzol Remove default opts from config We forgot to remove this method in #145352. This PR removes that. r? ```@Kobzol```
2 parents 69b76df + b244f29 commit 595d86b

File tree

1 file changed

+0
-53
lines changed

1 file changed

+0
-53
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -327,59 +327,6 @@ pub struct Config {
327327
}
328328

329329
impl Config {
330-
#[cfg_attr(
331-
feature = "tracing",
332-
instrument(target = "CONFIG_HANDLING", level = "trace", name = "Config::default_opts")
333-
)]
334-
pub fn default_opts() -> Config {
335-
#[cfg(feature = "tracing")]
336-
span!(target: "CONFIG_HANDLING", tracing::Level::TRACE, "constructing default config");
337-
338-
Config {
339-
bypass_bootstrap_lock: false,
340-
llvm_optimize: true,
341-
ninja_in_file: true,
342-
llvm_static_stdcpp: false,
343-
llvm_libzstd: false,
344-
backtrace: true,
345-
rust_optimize: RustOptimize::Bool(true),
346-
rust_optimize_tests: true,
347-
rust_randomize_layout: false,
348-
submodules: None,
349-
docs: true,
350-
docs_minification: true,
351-
rust_rpath: true,
352-
rust_strip: false,
353-
channel: "dev".to_string(),
354-
codegen_tests: true,
355-
rust_dist_src: true,
356-
rust_codegen_backends: vec![CodegenBackendKind::Llvm],
357-
deny_warnings: true,
358-
bindir: "bin".into(),
359-
dist_include_mingw_linker: true,
360-
dist_compression_profile: "fast".into(),
361-
362-
stdout_is_tty: std::io::stdout().is_terminal(),
363-
stderr_is_tty: std::io::stderr().is_terminal(),
364-
365-
// set by build.rs
366-
host_target: get_host_target(),
367-
368-
src: {
369-
let manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
370-
// Undo `src/bootstrap`
371-
manifest_dir.parent().unwrap().parent().unwrap().to_owned()
372-
},
373-
out: PathBuf::from("build"),
374-
375-
// This is needed by codegen_ssa on macOS to ship `llvm-objcopy` aliased to
376-
// `rust-objcopy` to workaround bad `strip`s on macOS.
377-
llvm_tools_enabled: true,
378-
379-
..Default::default()
380-
}
381-
}
382-
383330
pub fn set_dry_run(&mut self, dry_run: DryRun) {
384331
self.exec_ctx.set_dry_run(dry_run);
385332
}

0 commit comments

Comments
 (0)