Skip to content

Commit 44174d9

Browse files
authored
Rollup merge of #133863 - oli-obk:push-pystoxvtvssx, r=lqd
Rename `core_pattern_type` and `core_pattern_types` lib feature gates to `pattern_type_macro` That's what the gates are actually gating, and the single char difference in naming was not helpful either fixes #128987
2 parents ab16eeb + f613636 commit 44174d9

31 files changed

+53
-74
lines changed

library/core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ pub mod net;
345345
pub mod option;
346346
pub mod panic;
347347
pub mod panicking;
348-
#[unstable(feature = "core_pattern_types", issue = "123646")]
348+
#[unstable(feature = "pattern_type_macro", issue = "123646")]
349349
pub mod pat;
350350
pub mod pin;
351351
#[unstable(feature = "random", issue = "130703")]

library/core/src/pat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/// ```
77
#[macro_export]
88
#[rustc_builtin_macro(pattern_type)]
9-
#[unstable(feature = "core_pattern_type", issue = "123646")]
9+
#[unstable(feature = "pattern_type_macro", issue = "123646")]
1010
macro_rules! pattern_type {
1111
($($arg:tt)*) => {
1212
/* compiler built-in */

library/std/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ pub mod net;
589589
pub mod num;
590590
pub mod os;
591591
pub mod panic;
592-
#[unstable(feature = "core_pattern_types", issue = "123646")]
592+
#[unstable(feature = "pattern_type_macro", issue = "123646")]
593593
pub mod pat;
594594
pub mod path;
595595
#[unstable(feature = "anonymous_pipe", issue = "127154")]

src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3936,17 +3936,8 @@ The tracking issue for this feature is: [#117693]
39363936
"##,
39373937
},
39383938
Lint {
3939-
label: "core_pattern_type",
3940-
description: r##"# `core_pattern_type`
3941-
3942-
This feature has no tracking issue, and is therefore likely internal to the compiler, not being intended for general use.
3943-
3944-
------------------------
3945-
"##,
3946-
},
3947-
Lint {
3948-
label: "core_pattern_types",
3949-
description: r##"# `core_pattern_types`
3939+
label: "pattern_type_macro",
3940+
description: r##"# `pattern_type_macro`
39503941
39513942
This feature has no tracking issue, and is therefore likely internal to the compiler, not being intended for general use.
39523943

tests/codegen/pattern_type_symbols.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
//@ compile-flags: -Csymbol-mangling-version=v0 -Copt-level=0 --crate-type=lib
55

66
#![feature(pattern_types)]
7-
#![feature(core_pattern_types)]
8-
#![feature(core_pattern_type)]
7+
#![feature(pattern_type_macro)]
98

109
use std::pat::pattern_type;
1110

tests/ui/type/pattern_types/bad_const_generics_args_on_const_param.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(pattern_types, core_pattern_type)]
1+
#![feature(pattern_types, pattern_type_macro)]
22
#![allow(internal_features)]
33

44
type Pat<const START: u32, const END: u32> =

tests/ui/type/pattern_types/bad_pat.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(pattern_types)]
2-
#![feature(core_pattern_types)]
3-
#![feature(core_pattern_type)]
2+
#![feature(pattern_type_macro)]
43

54
use std::pat::pattern_type;
65

tests/ui/type/pattern_types/bad_pat.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0586]: inclusive range with no end
2-
--> $DIR/bad_pat.rs:7:43
2+
--> $DIR/bad_pat.rs:6:43
33
|
44
LL | type NonNullU32_2 = pattern_type!(u32 is 1..=);
55
| ^^^
@@ -12,7 +12,7 @@ LL + type NonNullU32_2 = pattern_type!(u32 is 1..);
1212
|
1313

1414
error[E0586]: inclusive range with no end
15-
--> $DIR/bad_pat.rs:9:40
15+
--> $DIR/bad_pat.rs:8:40
1616
|
1717
LL | type Positive2 = pattern_type!(i32 is 0..=);
1818
| ^^^
@@ -25,7 +25,7 @@ LL + type Positive2 = pattern_type!(i32 is 0..);
2525
|
2626

2727
error: wildcard patterns are not permitted for pattern types
28-
--> $DIR/bad_pat.rs:11:33
28+
--> $DIR/bad_pat.rs:10:33
2929
|
3030
LL | type Wild = pattern_type!(() is _);
3131
| ^

tests/ui/type/pattern_types/const_generics.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//@ check-pass
22

33
#![feature(pattern_types)]
4-
#![feature(core_pattern_types)]
5-
#![feature(core_pattern_type)]
4+
#![feature(pattern_type_macro)]
65

76
use std::pat::pattern_type;
87

tests/ui/type/pattern_types/derives.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//! Check that pattern types don't implement traits of their base automatically
22
33
#![feature(pattern_types)]
4-
#![feature(core_pattern_types)]
5-
#![feature(core_pattern_type)]
4+
#![feature(pattern_type_macro)]
65

76
use std::pat::pattern_type;
87

0 commit comments

Comments
 (0)