Skip to content

Commit 8d90647

Browse files
authored
Rollup merge of #104934 - ChrisDenton:all-anybody-wants, r=thomcc
Remove redundant `all` in cfg This appears to have been accidentally left in after removing the other branches 45bf1ed (hat tip to kangalioo for the git archaeology)
2 parents 6e6c42c + 2ab3f76 commit 8d90647

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

compiler/rustc_codegen_gcc/example/alloc_system.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
// The minimum alignment guaranteed by the architecture. This value is used to
1515
// add fast paths for low alignment values.
16-
#[cfg(all(any(target_arch = "x86",
16+
#[cfg(any(target_arch = "x86",
1717
target_arch = "arm",
1818
target_arch = "mips",
1919
target_arch = "powerpc",
20-
target_arch = "powerpc64")))]
20+
target_arch = "powerpc64"))]
2121
const MIN_ALIGN: usize = 8;
22-
#[cfg(all(any(target_arch = "x86_64",
22+
#[cfg(any(target_arch = "x86_64",
2323
target_arch = "aarch64",
2424
target_arch = "mips64",
2525
target_arch = "s390x",
26-
target_arch = "sparc64")))]
26+
target_arch = "sparc64"))]
2727
const MIN_ALIGN: usize = 16;
2828

2929
pub struct System;

compiler/rustc_span/src/analyze_source_file.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub fn analyze_source_file(
4141
}
4242

4343
cfg_if::cfg_if! {
44-
if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64")))] {
44+
if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
4545
fn analyze_source_file_dispatch(src: &str,
4646
source_file_start_pos: BytePos,
4747
lines: &mut Vec<BytePos>,

library/std/src/sys/common/alloc.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::ptr;
44

55
// The minimum alignment guaranteed by the architecture. This value is used to
66
// add fast paths for low alignment values.
7-
#[cfg(all(any(
7+
#[cfg(any(
88
target_arch = "x86",
99
target_arch = "arm",
1010
target_arch = "mips",
@@ -16,23 +16,23 @@ use crate::ptr;
1616
target_arch = "hexagon",
1717
all(target_arch = "riscv32", not(target_os = "espidf")),
1818
all(target_arch = "xtensa", not(target_os = "espidf")),
19-
)))]
19+
))]
2020
pub const MIN_ALIGN: usize = 8;
21-
#[cfg(all(any(
21+
#[cfg(any(
2222
target_arch = "x86_64",
2323
target_arch = "aarch64",
2424
target_arch = "mips64",
2525
target_arch = "s390x",
2626
target_arch = "sparc64",
2727
target_arch = "riscv64",
2828
target_arch = "wasm64",
29-
)))]
29+
))]
3030
pub const MIN_ALIGN: usize = 16;
3131
// The allocator on the esp-idf platform guarantees 4 byte alignment.
32-
#[cfg(all(any(
32+
#[cfg(any(
3333
all(target_arch = "riscv32", target_os = "espidf"),
3434
all(target_arch = "xtensa", target_os = "espidf"),
35-
)))]
35+
))]
3636
pub const MIN_ALIGN: usize = 4;
3737

3838
pub unsafe fn realloc_fallback(

0 commit comments

Comments
 (0)