diff options
| author | bors <bors@rust-lang.org> | 2025-04-06 10:16:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-06 10:16:28 +0000 |
| commit | f5c510260bef89f7799d0b8e1aa70d7d7925cd99 (patch) | |
| tree | cfccb974a05c281d895cbdb9982541728609f1b7 /compiler/rustc_driver_impl | |
| parent | e7df5b055d1ea724b225c44bd5084141d6ab42b4 (diff) | |
| parent | 7e4379c4eb25a423b8484d99b01bfc8f5bb7efd8 (diff) | |
| download | rust-f5c510260bef89f7799d0b8e1aa70d7d7925cd99.tar.gz rust-f5c510260bef89f7799d0b8e1aa70d7d7925cd99.zip | |
Auto merge of #138947 - madsmtm:refactor-apple-versions, r=Noratrieb
Refactor Apple version handling in the compiler Move various Apple version handling code in the compiler out `rustc_codegen_ssa` and into a place where it can be accessed by `rustc_attr_parsing`, which I found to be necessary when doing https://github.com/rust-lang/rust/pull/136867. Thought I'd split it out to make it easier to land, and to make further changes like https://github.com/rust-lang/rust/pull/131477 have fewer conflicts / PR dependencies. There should be no functional changes in this PR. `@rustbot` label O-apple r? rust-lang/compiler
Diffstat (limited to 'compiler/rustc_driver_impl')
| -rw-r--r-- | compiler/rustc_driver_impl/src/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_driver_impl/src/lib.rs b/compiler/rustc_driver_impl/src/lib.rs index 6fb01bf415a..595ac1edd28 100644 --- a/compiler/rustc_driver_impl/src/lib.rs +++ b/compiler/rustc_driver_impl/src/lib.rs @@ -34,7 +34,6 @@ use std::time::{Instant, SystemTime}; use std::{env, str}; use rustc_ast as ast; -use rustc_codegen_ssa::back::apple; use rustc_codegen_ssa::traits::CodegenBackend; use rustc_codegen_ssa::{CodegenErrors, CodegenResults}; use rustc_data_structures::profiling::{ @@ -807,8 +806,8 @@ fn print_crate_info( if sess.target.is_like_darwin { println_info!( "{}={}", - apple::deployment_target_env_var(&sess.target.os), - apple::pretty_version(apple::deployment_target(sess)), + rustc_target::spec::apple::deployment_target_env_var(&sess.target.os), + sess.apple_deployment_target().fmt_pretty(), ) } else { #[allow(rustc::diagnostic_outside_of_impl)] |
