From 9b31323b8f784ebb8689bb11489caefadb552f60 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Sat, 11 Jun 2022 08:30:46 -0700 Subject: [PATCH] Fix incorrectly spelled "variadic" --- compiler/rustc_ast_passes/src/feature_gate.rs | 4 ++-- compiler/rustc_passes/src/check_attr.rs | 12 ++++++------ compiler/rustc_span/src/symbol.rs | 2 +- library/core/src/fmt/mod.rs | 2 +- library/core/src/hash/mod.rs | 2 +- library/core/src/primitive_docs.rs | 4 ++-- library/core/src/tuple.rs | 2 +- library/std/src/primitive_docs.rs | 4 ++-- src/librustdoc/clean/inline.rs | 2 +- src/librustdoc/clean/mod.rs | 2 +- src/librustdoc/clean/types.rs | 2 +- src/librustdoc/html/format.rs | 2 +- .../feature-gates/feature-gate-rustdoc_internals.rs | 2 +- .../feature-gate-rustdoc_internals.stderr | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/compiler/rustc_ast_passes/src/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs index 1777438d304e..258692a982cf 100644 --- a/compiler/rustc_ast_passes/src/feature_gate.rs +++ b/compiler/rustc_ast_passes/src/feature_gate.rs @@ -402,8 +402,8 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { gate_feature_post!(self, rustdoc_internals, attr.span, msg); } - if nested_meta.has_name(sym::tuple_varadic) { - let msg = "`#[doc(tuple_varadic)]` is meant for internal use only"; + if nested_meta.has_name(sym::tuple_variadic) { + let msg = "`#[doc(tuple_variadic)]` is meant for internal use only"; gate_feature_post!(self, rustdoc_internals, attr.span, msg); } } diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs index ea8c1b45a60a..7de5cb2683a9 100644 --- a/compiler/rustc_passes/src/check_attr.rs +++ b/compiler/rustc_passes/src/check_attr.rs @@ -804,7 +804,7 @@ impl CheckAttrVisitor<'_> { true } - fn check_doc_tuple_varadic(&self, meta: &NestedMetaItem, hir_id: HirId) -> bool { + fn check_doc_tuple_variadic(&self, meta: &NestedMetaItem, hir_id: HirId) -> bool { match self.tcx.hir().find(hir_id).and_then(|node| match node { hir::Node::Item(item) => Some(&item.kind), _ => None, @@ -815,7 +815,7 @@ impl CheckAttrVisitor<'_> { .sess .struct_span_err( meta.span(), - "`#[doc(tuple_varadic)]` can only be used on unary tuples", + "`#[doc(tuple_variadic)]` can only be used on unary tuples", ) .emit(); return false; @@ -1095,9 +1095,9 @@ impl CheckAttrVisitor<'_> { is_valid = false } - sym::tuple_varadic - if !self.check_attr_not_crate_level(meta, hir_id, "tuple_varadic") - || !self.check_doc_tuple_varadic(meta, hir_id) => + sym::tuple_variadic + if !self.check_attr_not_crate_level(meta, hir_id, "tuple_variadic") + || !self.check_doc_tuple_variadic(meta, hir_id) => { is_valid = false } @@ -1156,7 +1156,7 @@ impl CheckAttrVisitor<'_> { | sym::notable_trait | sym::passes | sym::plugins - | sym::tuple_varadic => {} + | sym::tuple_variadic => {} sym::test => { if !self.check_test_attr(meta, hir_id) { diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 37e905f7f562..ce3efc036ae8 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1439,7 +1439,7 @@ symbols! { tuple, tuple_from_req, tuple_indexing, - tuple_varadic, + tuple_variadic, two_phase, ty, type_alias_enum_variants, diff --git a/library/core/src/fmt/mod.rs b/library/core/src/fmt/mod.rs index 6c76e1488397..5a9370a88eca 100644 --- a/library/core/src/fmt/mod.rs +++ b/library/core/src/fmt/mod.rs @@ -2335,7 +2335,7 @@ macro_rules! tuple { macro_rules! maybe_tuple_doc { ($a:ident @ #[$meta:meta] $item:item) => { - #[cfg_attr(not(bootstrap), doc(tuple_varadic))] + #[cfg_attr(not(bootstrap), doc(tuple_variadic))] #[doc = "This trait is implemented for tuples up to twelve items long."] #[$meta] $item diff --git a/library/core/src/hash/mod.rs b/library/core/src/hash/mod.rs index d79258d2ed99..9a4c877b2d36 100644 --- a/library/core/src/hash/mod.rs +++ b/library/core/src/hash/mod.rs @@ -900,7 +900,7 @@ mod impls { macro_rules! maybe_tuple_doc { ($a:ident @ #[$meta:meta] $item:item) => { - #[cfg_attr(not(bootstrap), doc(tuple_varadic))] + #[cfg_attr(not(bootstrap), doc(tuple_variadic))] #[doc = "This trait is implemented for tuples up to twelve items long."] #[$meta] $item diff --git a/library/core/src/primitive_docs.rs b/library/core/src/primitive_docs.rs index 510d47f4e702..bf4431c4958e 100644 --- a/library/core/src/primitive_docs.rs +++ b/library/core/src/primitive_docs.rs @@ -965,7 +965,7 @@ impl (T,) {} // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_varadic))] +#[cfg_attr(not(bootstrap), doc(tuple_variadic))] /// This trait is implemented on arbitrary-length tuples. impl Clone for (T,) { fn clone(&self) -> Self { @@ -976,7 +976,7 @@ impl Clone for (T,) { // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_varadic))] +#[cfg_attr(not(bootstrap), doc(tuple_variadic))] /// This trait is implemented on arbitrary-length tuples. impl Copy for (T,) { // empty diff --git a/library/core/src/tuple.rs b/library/core/src/tuple.rs index 9ddefc651baa..c6e3d045a78d 100644 --- a/library/core/src/tuple.rs +++ b/library/core/src/tuple.rs @@ -105,7 +105,7 @@ macro_rules! tuple_impls { macro_rules! maybe_tuple_doc { ($a:ident @ #[$meta:meta] $item:item) => { - #[cfg_attr(not(bootstrap), doc(tuple_varadic))] + #[cfg_attr(not(bootstrap), doc(tuple_variadic))] #[doc = "This trait is implemented for tuples up to twelve items long."] #[$meta] $item diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 510d47f4e702..bf4431c4958e 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -965,7 +965,7 @@ impl (T,) {} // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_varadic))] +#[cfg_attr(not(bootstrap), doc(tuple_variadic))] /// This trait is implemented on arbitrary-length tuples. impl Clone for (T,) { fn clone(&self) -> Self { @@ -976,7 +976,7 @@ impl Clone for (T,) { // Fake impl that's only really used for docs. #[cfg(doc)] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(bootstrap), doc(tuple_varadic))] +#[cfg_attr(not(bootstrap), doc(tuple_variadic))] /// This trait is implemented on arbitrary-length tuples. impl Copy for (T,) { // empty diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index d8f6a9c3ff07..d4c38f34b5b1 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -500,7 +500,7 @@ pub(crate) fn build_impl( for_, items: trait_items, polarity, - kind: if utils::has_doc_flag(tcx, did, sym::tuple_varadic) { + kind: if utils::has_doc_flag(tcx, did, sym::tuple_variadic) { ImplKind::TupleVaradic } else { ImplKind::Normal diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index b15ef424cb64..fd30691c3248 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1999,7 +1999,7 @@ fn clean_impl<'tcx>( for_, items, polarity: tcx.impl_polarity(def_id), - kind: if utils::has_doc_flag(tcx, def_id.to_def_id(), sym::tuple_varadic) { + kind: if utils::has_doc_flag(tcx, def_id.to_def_id(), sym::tuple_variadic) { ImplKind::TupleVaradic } else { ImplKind::Normal diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index f77884370f55..83ab9acd3005 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -2407,7 +2407,7 @@ impl ImplKind { matches!(self, ImplKind::Blanket(_)) } - pub(crate) fn is_tuple_varadic(&self) -> bool { + pub(crate) fn is_tuple_variadic(&self) -> bool { matches!(self, ImplKind::TupleVaradic) } diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 2f433c2313b7..69bd0744a109 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -1076,7 +1076,7 @@ impl clean::Impl { if let clean::Type::Tuple(types) = &self.for_ && let [clean::Type::Generic(name)] = &types[..] && - (self.kind.is_tuple_varadic() || self.kind.is_auto()) { + (self.kind.is_tuple_variadic() || self.kind.is_auto()) { primitive_link_fragment(f, PrimitiveType::Tuple, &format!("({name}, ...)"), "#trait-implementations-1", cx)?; } else if let Some(ty) = self.kind.as_blanket_ty() { fmt_type(ty, f, use_absolute, cx)?; diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs index e40a3044b946..6a144412d075 100644 --- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs +++ b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.rs @@ -4,7 +4,7 @@ mod foo {} trait Mine {} -#[doc(tuple_varadic)] //~ ERROR: `#[doc(tuple_varadic)]` is meant for internal use only +#[doc(tuple_variadic)] //~ ERROR: `#[doc(tuple_variadic)]` is meant for internal use only impl Mine for (T,) {} fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr index 00dab359e735..2b1c790e80c1 100644 --- a/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustdoc_internals.stderr @@ -7,10 +7,10 @@ LL | #[doc(keyword = "match")] = note: see issue #90418 for more information = help: add `#![feature(rustdoc_internals)]` to the crate attributes to enable -error[E0658]: `#[doc(tuple_varadic)]` is meant for internal use only +error[E0658]: `#[doc(tuple_variadic)]` is meant for internal use only --> $DIR/feature-gate-rustdoc_internals.rs:7:1 | -LL | #[doc(tuple_varadic)] +LL | #[doc(tuple_variadic)] | ^^^^^^^^^^^^^^^^^^^^^ | = note: see issue #90418 for more information