diff options
| author | bors <bors@rust-lang.org> | 2025-05-22 02:14:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-22 02:14:23 +0000 |
| commit | 6eef33bb399cabfab16aa4e0825895f5f32f4e26 (patch) | |
| tree | d5ad348ac4a4f699ed35aafc4327a09faaa62dd0 /compiler/rustc_span | |
| parent | 5df0f729f5355cb3cd91f6bcff13566ae96dc220 (diff) | |
| parent | 999967a57dce987bbad353d152f03c3ef67d41f2 (diff) | |
| download | rust-6eef33bb399cabfab16aa4e0825895f5f32f4e26.tar.gz rust-6eef33bb399cabfab16aa4e0825895f5f32f4e26.zip | |
Auto merge of #137198 - tgross35:cfg-match-rename, r=Amanieu
Rename `cfg_match!` to `cfg_select!` [`@Nemo157` pointed out](https://github.com/rust-lang/rust/issues/115585#issuecomment-2346307605) that `cfg_match!` syntax does not actually align well with match syntax, which is a possible source of confusion. The comment points out that usage is instead more similar to ecosystem `select!` macros. Rename `cfg_match!` to `cfg_select!` to match this. Tracking issue: https://github.com/rust-lang/rust/issues/115585 [1]: https://github.com/rust-lang/rust/issues/115585#issuecomment-2346307605
Diffstat (limited to 'compiler/rustc_span')
| -rw-r--r-- | compiler/rustc_span/src/analyze_source_file.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/analyze_source_file.rs b/compiler/rustc_span/src/analyze_source_file.rs index 6384fa06c21..c32593a6d95 100644 --- a/compiler/rustc_span/src/analyze_source_file.rs +++ b/compiler/rustc_span/src/analyze_source_file.rs @@ -29,7 +29,7 @@ pub(crate) fn analyze_source_file(src: &str) -> (Vec<RelativeBytePos>, Vec<Multi (lines, multi_byte_chars) } -cfg_match! { +cfg_select! { any(target_arch = "x86", target_arch = "x86_64") => { fn analyze_source_file_dispatch( src: &str, diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index 22ca8accf9f..906462a0d22 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -20,7 +20,7 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")] #![doc(rust_logo)] #![feature(array_windows)] -#![feature(cfg_match)] +#![feature(cfg_select)] #![feature(core_io_borrowed_buf)] #![feature(hash_set_entry)] #![feature(if_let_guard)] |