From a09249c0aaf2d586827e270955f17cd4f99bff33 Mon Sep 17 00:00:00 2001
From: Caio <c410.f3r@gmail.com>
Date: Sun, 1 Oct 2023 07:52:20 -0300
Subject: [PATCH] Initiate the inner usage of cfg_match (Compiler)
---
Cargo.lock | 2 --
compiler/rustc_data_structures/Cargo.toml | 1 -
compiler/rustc_data_structures/src/flock.rs | 13 ++++---
compiler/rustc_data_structures/src/lib.rs | 35 +++++++++----------
compiler/rustc_data_structures/src/marker.rs | 29 ++++++---------
.../rustc_data_structures/src/profiling.rs | 13 ++++---
compiler/rustc_data_structures/src/sync.rs | 7 ++--
compiler/rustc_span/Cargo.toml | 1 -
.../rustc_span/src/analyze_source_file.rs | 8 ++---
compiler/rustc_span/src/lib.rs | 17 ++++-----
10 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 7f91d12a419c1..20b9039190691 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3594,7 +3594,6 @@ version = "0.0.0"
dependencies = [
"arrayvec",
"bitflags 1.3.2",
- "cfg-if",
"elsa",
"ena",
"indexmap 2.0.0",
@@ -4428,7 +4427,6 @@ dependencies = [
name = "rustc_span"
version = "0.0.0"
dependencies = [
- "cfg-if",
"indexmap 2.0.0",
"md-5",
"rustc_arena",
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index f77bd53e76c6a..dce4e199e17ea 100644
--- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
[dependencies]
arrayvec = { version = "0.7", default-features = false }
bitflags = "1.2.1"
-cfg-if = "1.0"
ena = "0.14.2"
indexmap = { version = "2.0.0" }
jobserver_crate = { version = "0.1.13", package = "jobserver" }
diff --git a/compiler/rustc_data_structures/src/flock.rs b/compiler/rustc_data_structures/src/flock.rs
index efdb44248d1d7..008565e4c7b97 100644
--- a/compiler/rustc_data_structures/src/flock.rs
+++ b/compiler/rustc_data_structures/src/flock.rs
@@ -4,17 +4,20 @@
//! green/native threading. This is just a bare-bones enough solution for
//! librustdoc, it is not production quality at all.
-cfg_if! {
- if #[cfg(target_os = "linux")] {
+cfg_match! {
+ cfg(target_os = "linux") => {
mod linux;
use linux as imp;
- } else if #[cfg(unix)] {
+ }
+ cfg(unix) => {
mod unix;
use unix as imp;
- } else if #[cfg(windows)] {
+ }
+ cfg(windows) => {
mod windows;
use self::windows as imp;
- } else {
+ }
+ _ => {
mod unsupported;
use unsupported as imp;
}
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs
index 461ec3a90ed97..f54721a93c524 100644
--- a/compiler/rustc_data_structures/src/lib.rs
+++ b/compiler/rustc_data_structures/src/lib.rs
@@ -6,45 +6,44 @@
//!
//! This API is completely unstable and subject to change.
+#![allow(internal_features)]
+#![allow(rustc::default_hash_types)]
+#![allow(rustc::potential_query_instability)]
+#![deny(rustc::diagnostic_outside_of_impl)]
+#![deny(rustc::untranslatable_diagnostic)]
+#![deny(unsafe_op_in_unsafe_fn)]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
+#![feature(allocator_api)]
#![feature(array_windows)]
#![feature(associated_type_bounds)]
#![feature(auto_traits)]
#![feature(cell_leak)]
+#![feature(cfg_match)]
#![feature(core_intrinsics)]
#![feature(extend_one)]
+#![feature(get_mut_unchecked)]
#![feature(hash_raw_entry)]
#![feature(hasher_prefixfree_extras)]
+#![feature(lazy_cell)]
+#![feature(lint_reasons)]
+#![feature(macro_metavar_expr)]
#![feature(maybe_uninit_uninit_array)]
#![feature(min_specialization)]
+#![feature(negative_impls)]
#![feature(never_type)]
-#![feature(type_alias_impl_trait)]
#![feature(new_uninit)]
-#![feature(lazy_cell)]
+#![feature(ptr_alignment_type)]
#![feature(rustc_attrs)]
-#![feature(negative_impls)]
+#![feature(strict_provenance)]
#![feature(test)]
#![feature(thread_id_value)]
-#![feature(vec_into_raw_parts)]
-#![feature(allocator_api)]
-#![feature(get_mut_unchecked)]
-#![feature(lint_reasons)]
+#![feature(type_alias_impl_trait)]
#![feature(unwrap_infallible)]
-#![feature(strict_provenance)]
-#![feature(ptr_alignment_type)]
-#![feature(macro_metavar_expr)]
-#![allow(rustc::default_hash_types)]
-#![allow(rustc::potential_query_instability)]
-#![deny(rustc::untranslatable_diagnostic)]
-#![deny(rustc::diagnostic_outside_of_impl)]
-#![allow(internal_features)]
-#![deny(unsafe_op_in_unsafe_fn)]
+#![feature(vec_into_raw_parts)]
#[macro_use]
extern crate tracing;
#[macro_use]
-extern crate cfg_if;
-#[macro_use]
extern crate rustc_macros;
use std::fmt;
diff --git a/compiler/rustc_data_structures/src/marker.rs b/compiler/rustc_data_structures/src/marker.rs
index b067f9d4502df..b97454c46e8a5 100644
--- a/compiler/rustc_data_structures/src/marker.rs
+++ b/compiler/rustc_data_structures/src/marker.rs
@@ -1,11 +1,12 @@
-cfg_if!(
- if #[cfg(not(parallel_compiler))] {
+cfg_match! {
+ cfg(not(parallel_compiler)) => {
pub auto trait DynSend {}
pub auto trait DynSync {}
impl<T> DynSend for T {}
impl<T> DynSync for T {}
- } else {
+ }
+ _ => {
#[rustc_on_unimplemented(
message = "`{Self}` doesn't implement `DynSend`. \
Add it to `rustc_data_structures::marker` or use `IntoDynSyncSend` if it's already `Send`"
@@ -48,13 +49,9 @@ cfg_if!(
[std::io::StdoutLock<'_>]
[std::io::StderrLock<'_>]
);
- cfg_if!(
- // Consistent with `std`
- // `os_imp::Env` is `!Send` in these platforms
- if #[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))] {
- impl !DynSend for std::env::VarsOs {}
- }
- );
+
+ #[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
+ impl !DynSend for std::env::VarsOs {}
macro_rules! already_send {
($([$ty: ty])*) => {
@@ -123,13 +120,9 @@ cfg_if!(
[std::sync::mpsc::Receiver<T> where T]
[std::sync::mpsc::Sender<T> where T]
);
- cfg_if!(
- // Consistent with `std`
- // `os_imp::Env` is `!Sync` in these platforms
- if #[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))] {
- impl !DynSync for std::env::VarsOs {}
- }
- );
+
+ #[cfg(any(unix, target_os = "hermit", target_os = "wasi", target_os = "solid_asp3"))]
+ impl !DynSync for std::env::VarsOs {}
macro_rules! already_sync {
($([$ty: ty])*) => {
@@ -183,7 +176,7 @@ cfg_if!(
[thin_vec::ThinVec<T> where T: DynSync]
);
}
-);
+}
pub fn assert_dyn_sync<T: ?Sized + DynSync>() {}
pub fn assert_dyn_send<T: ?Sized + DynSend>() {}
diff --git a/compiler/rustc_data_structures/src/profiling.rs b/compiler/rustc_data_structures/src/profiling.rs
index e688feb5fe176..ef7375a732064 100644
--- a/compiler/rustc_data_structures/src/profiling.rs
+++ b/compiler/rustc_data_structures/src/profiling.rs
@@ -859,8 +859,8 @@ fn get_thread_id() -> u32 {
}
// Memory reporting
-cfg_if! {
- if #[cfg(windows)] {
+cfg_match! {
+ cfg(windows) => {
pub fn get_resident_set_size() -> Option<usize> {
use std::mem;
@@ -885,7 +885,8 @@ cfg_if! {
Some(pmc.WorkingSetSize)
}
- } else if #[cfg(target_os = "macos")] {
+ }
+ cfg(target_os = "macos") => {
pub fn get_resident_set_size() -> Option<usize> {
use libc::{c_int, c_void, getpid, proc_pidinfo, proc_taskinfo, PROC_PIDTASKINFO};
use std::mem;
@@ -903,7 +904,8 @@ cfg_if! {
}
}
}
- } else if #[cfg(unix)] {
+ }
+ cfg(unix) => {
pub fn get_resident_set_size() -> Option<usize> {
let field = 1;
let contents = fs::read("/proc/self/statm").ok()?;
@@ -912,7 +914,8 @@ cfg_if! {
let npages = s.parse::<usize>().ok()?;
Some(npages * 4096)
}
- } else {
+ }
+ _ => {
pub fn get_resident_set_size() -> Option<usize> {
None
}
diff --git a/compiler/rustc_data_structures/src/sync.rs b/compiler/rustc_data_structures/src/sync.rs
index cca043ba0d18d..62fff604f8133 100644
--- a/compiler/rustc_data_structures/src/sync.rs
+++ b/compiler/rustc_data_structures/src/sync.rs
@@ -109,8 +109,8 @@ mod mode {
pub use mode::{is_dyn_thread_safe, set_dyn_thread_safe_mode};
-cfg_if! {
- if #[cfg(not(parallel_compiler))] {
+cfg_match! {
+ cfg(not(parallel_compiler)) => {
use std::ops::Add;
use std::cell::Cell;
@@ -251,7 +251,8 @@ cfg_if! {
MTLock(self.0.clone())
}
}
- } else {
+ }
+ _ => {
pub use std::marker::Send as Send;
pub use std::marker::Sync as Sync;
diff --git a/compiler/rustc_span/Cargo.toml b/compiler/rustc_span/Cargo.toml
index ee93f74e750df..31c2a56faa539 100644
--- a/compiler/rustc_span/Cargo.toml
+++ b/compiler/rustc_span/Cargo.toml
@@ -13,7 +13,6 @@ rustc_index = { path = "../rustc_index" }
rustc_arena = { path = "../rustc_arena" }
scoped-tls = "1.0"
unicode-width = "0.1.4"
-cfg-if = "1.0"
tracing = "0.1"
sha1 = "0.10.0"
sha2 = "0.10.1"
diff --git a/compiler/rustc_span/src/analyze_source_file.rs b/compiler/rustc_span/src/analyze_source_file.rs
index 450d5455ff938..7da7dc610ecf1 100644
--- a/compiler/rustc_span/src/analyze_source_file.rs
+++ b/compiler/rustc_span/src/analyze_source_file.rs
@@ -33,8 +33,8 @@ pub fn analyze_source_file(
(lines, multi_byte_chars, non_narrow_chars)
}
-cfg_if::cfg_if! {
- if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
+cfg_match! {
+ cfg(any(target_arch = "x86", target_arch = "x86_64")) => {
fn analyze_source_file_dispatch(src: &str,
lines: &mut Vec<RelativeBytePos>,
multi_byte_chars: &mut Vec<MultiByteChar>,
@@ -172,8 +172,8 @@ cfg_if::cfg_if! {
non_narrow_chars);
}
}
- } else {
-
+ }
+ _ => {
// The target (or compiler version) does not support SSE2 ...
fn analyze_source_file_dispatch(src: &str,
lines: &mut Vec<RelativeBytePos>,
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index 772e09291a139..317e27af7c02d 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -13,19 +13,20 @@
//!
//! This API is completely unstable and subject to change.
+#![allow(internal_features)]
+#![deny(rustc::diagnostic_outside_of_impl)]
+#![deny(rustc::untranslatable_diagnostic)]
#![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
#![feature(array_windows)]
+#![feature(cfg_match)]
#![feature(if_let_guard)]
-#![feature(negative_impls)]
-#![feature(min_specialization)]
-#![feature(rustc_attrs)]
#![feature(let_chains)]
-#![feature(round_char_boundary)]
-#![feature(read_buf)]
+#![feature(min_specialization)]
+#![feature(negative_impls)]
#![feature(new_uninit)]
-#![deny(rustc::untranslatable_diagnostic)]
-#![deny(rustc::diagnostic_outside_of_impl)]
-#![allow(internal_features)]
+#![feature(read_buf)]
+#![feature(round_char_boundary)]
+#![feature(rustc_attrs)]
#[macro_use]
extern crate rustc_macros;