Skip to content

Commit e25ee6b

Browse files
committed
Auto merge of #150655 - matthiaskrgr:rollup-8oshivb, r=matthiaskrgr
Rollup of 2 pull requests Successful merges: - #150596 (Add tracking issue for sized_hierarchy) - #150651 (Fix typo in pattern usefulness documentation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f57b9e6 + c0c4525 commit e25ee6b

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

compiler/rustc_feature/src/unstable.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,22 +239,16 @@ declare_features! (
239239
(internal, negative_bounds, "1.71.0", None),
240240
/// Set the maximum pattern complexity allowed (not limited by default).
241241
(internal, pattern_complexity_limit, "1.78.0", None),
242-
/// Allows using pattern types.
243-
(internal, pattern_types, "1.79.0", Some(123646)),
244242
/// Allows using `#[prelude_import]` on glob `use` items.
245243
(internal, prelude_import, "1.2.0", None),
246244
/// Used to identify crates that contain the profiler runtime.
247245
(internal, profiler_runtime, "1.18.0", None),
248246
/// Allows using `rustc_*` attributes (RFC 572).
249247
(internal, rustc_attrs, "1.0.0", None),
250-
/// Introduces a hierarchy of `Sized` traits (RFC 3729).
251-
(unstable, sized_hierarchy, "1.89.0", None),
252248
/// Allows using the `#[stable]` and `#[unstable]` attributes.
253249
(internal, staged_api, "1.0.0", None),
254250
/// Added for testing unstable lints; perma-unstable.
255251
(internal, test_unstable_lint, "1.60.0", None),
256-
/// Helps with formatting for `group_imports = "StdExternalCrate"`.
257-
(unstable, unqualified_local_imports, "1.83.0", Some(138299)),
258252
/// Use for stable + negative coherence and strict coherence depending on trait's
259253
/// rustc_strict_coherence value.
260254
(unstable, with_negative_coherence, "1.60.0", None),
@@ -295,6 +289,8 @@ declare_features! (
295289
(internal, needs_panic_runtime, "1.10.0", Some(32837)),
296290
/// Allows using the `#![panic_runtime]` attribute.
297291
(internal, panic_runtime, "1.10.0", Some(32837)),
292+
/// Allows using pattern types.
293+
(internal, pattern_types, "1.79.0", Some(123646)),
298294
/// Allows using `#[rustc_allow_const_fn_unstable]`.
299295
/// This is an attribute on `const fn` for the same
300296
/// purpose as `#[allow_internal_unstable]`.
@@ -305,12 +301,16 @@ declare_features! (
305301
(internal, rustdoc_internals, "1.58.0", Some(90418)),
306302
/// Allows using the `rustdoc::missing_doc_code_examples` lint
307303
(unstable, rustdoc_missing_doc_code_examples, "1.31.0", Some(101730)),
304+
/// Introduces a hierarchy of `Sized` traits (RFC 3729).
305+
(unstable, sized_hierarchy, "1.89.0", Some(144404)),
308306
/// Allows using `#[structural_match]` which indicates that a type is structurally matchable.
309307
/// FIXME: Subsumed by trait `StructuralPartialEq`, cannot move to removed until a library
310308
/// feature with the same name exists.
311309
(unstable, structural_match, "1.8.0", Some(31434)),
312310
/// Allows using the `rust-call` ABI.
313311
(unstable, unboxed_closures, "1.0.0", Some(29625)),
312+
/// Helps with formatting for `group_imports = "StdExternalCrate"`.
313+
(unstable, unqualified_local_imports, "1.83.0", Some(138299)),
314314
// !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!!
315315
// Features are listed in alphabetical order. Tidy will fail if you don't keep it this way.
316316
// !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!! !!!!

compiler/rustc_pattern_analysis/src/usefulness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
//! on pattern-tuples.
170170
//!
171171
//! Let `pt_1, .., pt_n` and `qt` be length-m tuples of patterns for the same type `(T_1, .., T_m)`.
172-
//! We compute `usefulness(tp_1, .., tp_n, tq)` as follows:
172+
//! We compute `usefulness(pt_1, .., pt_n, qt)` as follows:
173173
//!
174174
//! - Base case: `m == 0`.
175175
//! The pattern-tuples are all empty, i.e. they're all `()`. Thus `tq` is useful iff there are

library/core/src/marker.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ pub trait Sized: MetaSized {
163163
}
164164

165165
/// Types with a size that can be determined from pointer metadata.
166-
#[unstable(feature = "sized_hierarchy", issue = "none")]
166+
#[unstable(feature = "sized_hierarchy", issue = "144404")]
167167
#[lang = "meta_sized"]
168168
#[diagnostic::on_unimplemented(
169169
message = "the size for values of type `{Self}` cannot be known",
@@ -181,7 +181,7 @@ pub trait MetaSized: PointeeSized {
181181
}
182182

183183
/// Types that may or may not have a size.
184-
#[unstable(feature = "sized_hierarchy", issue = "none")]
184+
#[unstable(feature = "sized_hierarchy", issue = "144404")]
185185
#[lang = "pointee_sized"]
186186
#[diagnostic::on_unimplemented(
187187
message = "values of type `{Self}` may or may not have a size",

0 commit comments

Comments
 (0)