Rename unconstructible to unconstructable

Author: mu001999

compiler/rustc_lint_defs/src/builtin.rs

@@ -112,7 +112,7 @@ declare_lint_pass! {
         TYVAR_BEHIND_RAW_POINTER,
         UNCONDITIONAL_PANIC,
         UNCONDITIONAL_RECURSION,
-        UNCONSTRUCTIBLE_PUB_STRUCT,
+        UNCONSTRUCTABLE_PUB_STRUCT,
         UNCOVERED_PARAM_IN_PROJECTION,
         UNEXPECTED_CFGS,
         UNFULFILLED_LINT_EXPECTATIONS,
@@ -760,13 +760,13 @@ declare_lint! {
 }
 
 declare_lint! {
-    /// The `unconstructible_pub_struct` lint detects public structs that
+    /// The `unconstructable_pub_struct` lint detects public structs that
     /// are unused locally and cannot be constructed externally.
     ///
     /// ### Example
     ///
     /// ```rust,compile_fail
-    /// #![deny(unconstructible_pub_struct)]
+    /// #![deny(unconstructable_pub_struct)]
     ///
     /// pub struct Foo(i32);
     /// # fn main() {}
@@ -776,7 +776,7 @@ declare_lint! {
     ///
     /// ### Explanation
     ///
-    /// Unconstructible pub structs may signal a mistake or unfinished code.
+    /// Unconstructable pub structs may signal a mistake or unfinished code.
     /// To silence the warning for individual items, prefix the name with an
     /// underscore such as `_Foo`.
     ///
@@ -786,7 +786,7 @@ declare_lint! {
     /// things like well-formedness.
     ///
     /// Otherwise, consider removing it if the struct is no longer in use.
-    pub UNCONSTRUCTIBLE_PUB_STRUCT,
+    pub UNCONSTRUCTABLE_PUB_STRUCT,
     Allow,
     "detects pub structs that are unused locally and cannot be constructed externally"
 }

compiler/rustc_passes/messages.ftl

@@ -575,8 +575,8 @@ passes_trait_impl_const_stable =
 passes_transparent_incompatible =
     transparent {$target} cannot have other repr hints
 
-passes_unconstructible_pub_struct =
-    pub struct `{$name}` is unconstructible externally and never constructed locally
+passes_unconstructable_pub_struct =
+    pub struct `{$name}` is unconstructable externally and never constructed locally
     .help = this struct may be unused locally and also externally, consider removing it
 
 passes_unexportable_adt_with_private_fields = ADT types with private fields are not exportable

compiler/rustc_passes/src/dead.rs

@@ -19,12 +19,12 @@ use rustc_middle::middle::privacy::Level;
 use rustc_middle::query::Providers;
 use rustc_middle::ty::{self, AssocTag, TyCtxt};
 use rustc_middle::{bug, span_bug};
-use rustc_session::lint::builtin::{DEAD_CODE, UNCONSTRUCTIBLE_PUB_STRUCT};
+use rustc_session::lint::builtin::{DEAD_CODE, UNCONSTRUCTABLE_PUB_STRUCT};
 use rustc_session::lint::{self, LintExpectationId};
 use rustc_span::{Symbol, kw, sym};
 
 use crate::errors::{
-    ChangeFields, IgnoredDerivedImpls, MultipleDeadCodes, ParentInfo, UnconstructiblePubStruct,
+    ChangeFields, IgnoredDerivedImpls, MultipleDeadCodes, ParentInfo, UnconstructablePubStruct,
     UselessAssignment,
 };
 
@@ -772,9 +772,9 @@ impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
     }
 }
 
-fn has_allow_unconstructible_pub_struct(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
+fn has_allow_unconstructable_pub_struct(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
     let hir_id = tcx.local_def_id_to_hir_id(def_id);
-    let lint_level = tcx.lint_level_at_node(UNCONSTRUCTIBLE_PUB_STRUCT, hir_id).level;
+    let lint_level = tcx.lint_level_at_node(UNCONSTRUCTABLE_PUB_STRUCT, hir_id).level;
     matches!(lint_level, lint::Allow | lint::Expect)
 }
 
@@ -912,12 +912,12 @@ fn create_and_seed_worklist(
                             true,
                         ),
                         DefKind::Struct => (
-                            has_allow_unconstructible_pub_struct(tcx, *id)
+                            has_allow_unconstructable_pub_struct(tcx, *id)
                                 || struct_can_be_constructed_directly(tcx, *id),
                             false,
                         ),
                         DefKind::Ctor(CtorOf::Struct, CtorKind::Fn) => (
-                            has_allow_unconstructible_pub_struct(tcx, tcx.local_parent(*id))
+                            has_allow_unconstructable_pub_struct(tcx, tcx.local_parent(*id))
                                 || struct_can_be_constructed_directly(tcx, tcx.local_parent(*id)),
                             false,
                         ),
@@ -1380,8 +1380,8 @@ fn check_mod_deathness(tcx: TyCtxt<'_>, module: LocalModDefId) {
 
         let hir_id = tcx.local_def_id_to_hir_id(def_id);
         let vis_span = tcx.hir_node(hir_id).expect_item().vis_span;
-        let diag = UnconstructiblePubStruct { name, vis_span };
-        tcx.emit_node_span_lint(UNCONSTRUCTIBLE_PUB_STRUCT, hir_id, tcx.hir_span(hir_id), diag);
+        let diag = UnconstructablePubStruct { name, vis_span };
+        tcx.emit_node_span_lint(UNCONSTRUCTABLE_PUB_STRUCT, hir_id, tcx.hir_span(hir_id), diag);
     }
 }
 

compiler/rustc_passes/src/errors.rs

@@ -1250,8 +1250,8 @@ pub(crate) enum MultipleDeadCodes<'tcx> {
 }
 
 #[derive(LintDiagnostic)]
-#[diag(passes_unconstructible_pub_struct)]
-pub(crate) struct UnconstructiblePubStruct {
+#[diag(passes_unconstructable_pub_struct)]
+pub(crate) struct UnconstructablePubStruct {
     pub name: Symbol,
     #[help]
     pub vis_span: Span,

tests/ui/lint/dead-code/unconstructible-pub-struct.rs renamed to tests/ui/lint/dead-code/unconstructable-pub-struct.rs

@@ -1,5 +1,5 @@
 #![feature(never_type)]
-#![deny(unconstructible_pub_struct)]
+#![deny(unconstructable_pub_struct)]
 
 pub struct T1(!);
 pub struct T2(());
@@ -27,7 +27,7 @@ pub struct T8<X> {
     _x: std::marker::PhantomData<X>,
 }
 
-pub struct T9<X> { //~ ERROR: pub struct `T9` is unconstructible externally and never constructed locally
+pub struct T9<X> { //~ ERROR: pub struct `T9` is unconstructable externally and never constructed locally
     _x: std::marker::PhantomData<X>,
     _y: i32,
 }
@@ -38,7 +38,7 @@ mod pri {
     pub struct Unreachable(i32);
 }
 
-pub struct NeverConstructed(i32); //~ ERROR: pub struct `NeverConstructed` is unconstructible externally and never constructed locally
+pub struct NeverConstructed(i32); //~ ERROR: pub struct `NeverConstructed` is unconstructable externally and never constructed locally
 
 impl NeverConstructed {
     pub fn not_construct_self(&self) {}

tests/ui/lint/dead-code/unconstructible-pub-struct.stderr renamed to tests/ui/lint/dead-code/unconstructable-pub-struct.stderr

@@ -1,28 +1,28 @@
-error: pub struct `T9` is unconstructible externally and never constructed locally
-  --> $DIR/unconstructible-pub-struct.rs:30:1
+error: pub struct `T9` is unconstructable externally and never constructed locally
+  --> $DIR/unconstructable-pub-struct.rs:30:1
    |
 LL | pub struct T9<X> {
    | ^^^^^^^^^^^^^^^^
    |
 help: this struct may be unused locally and also externally, consider removing it
-  --> $DIR/unconstructible-pub-struct.rs:30:1
+  --> $DIR/unconstructable-pub-struct.rs:30:1
    |
 LL | pub struct T9<X> {
    | ^^^
 note: the lint level is defined here
-  --> $DIR/unconstructible-pub-struct.rs:2:9
+  --> $DIR/unconstructable-pub-struct.rs:2:9
    |
-LL | #![deny(unconstructible_pub_struct)]
+LL | #![deny(unconstructable_pub_struct)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: pub struct `NeverConstructed` is unconstructible externally and never constructed locally
-  --> $DIR/unconstructible-pub-struct.rs:41:1
+error: pub struct `NeverConstructed` is unconstructable externally and never constructed locally
+  --> $DIR/unconstructable-pub-struct.rs:41:1
    |
 LL | pub struct NeverConstructed(i32);
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: this struct may be unused locally and also externally, consider removing it
-  --> $DIR/unconstructible-pub-struct.rs:41:1
+  --> $DIR/unconstructable-pub-struct.rs:41:1
    |
 LL | pub struct NeverConstructed(i32);
    | ^^^