Skip to content

Commit 4b65865

Browse files
authored
Rollup merge of rust-lang#131976 - jalil-salame:rustdoc-types-copy-enums, r=aDotInTheVoid
feat(rustdoc-json-types): mark simple enums as copy Fixes rust-lang/rustdoc-types#26 and some typos in the documentation r? `@aDotInTheVoid` I have been assigning these PRs to you `@aDotInTheVoid,` is that okay? I think I'm out of PRs for now, but for future reference c:
2 parents c2ed685 + afa75f0 commit 4b65865

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/rustdoc-json-types/lib.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ pub enum AssocItemConstraintKind {
317317
// FIXME(aDotInTheVoid): Consider making this non-public in rustdoc-types.
318318
pub struct Id(pub u32);
319319

320-
/// The fundamental kind of an item. Unlike [`ItemEnum`], this does not carry any aditional info.
320+
/// The fundamental kind of an item. Unlike [`ItemEnum`], this does not carry any additional info.
321321
///
322322
/// Part of [`ItemSummary`].
323-
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
323+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
324324
#[serde(rename_all = "snake_case")]
325325
pub enum ItemKind {
326326
/// A module declaration, e.g. `mod foo;` or `mod foo {}`
@@ -710,7 +710,7 @@ pub enum Abi {
710710
Aapcs { unwind: bool },
711711
/// Can be specified as `extern "win64"`.
712712
Win64 { unwind: bool },
713-
/// Can be specifed as `extern "sysv64"`.
713+
/// Can be specified as `extern "sysv64"`.
714714
SysV64 { unwind: bool },
715715
/// Can be specified as `extern "system"`.
716716
System { unwind: bool },
@@ -904,7 +904,7 @@ pub enum GenericBound {
904904
}
905905

906906
/// A set of modifiers applied to a trait.
907-
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
907+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
908908
#[serde(rename_all = "snake_case")]
909909
pub enum TraitBoundModifier {
910910
/// Marks the absence of a modifier.
@@ -1008,7 +1008,7 @@ pub enum Type {
10081008
QualifiedPath {
10091009
/// The name of the associated type in the parent type.
10101010
///
1011-
/// ```ignore (incomplete expresssion)
1011+
/// ```ignore (incomplete expression)
10121012
/// <core::array::IntoIter<u32, 42> as Iterator>::Item
10131013
/// // ^^^^
10141014
/// ```
@@ -1095,7 +1095,7 @@ pub struct FunctionSignature {
10951095
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
10961096
pub struct Trait {
10971097
/// Whether the trait is marked `auto` and is thus implemented automatically
1098-
/// for all aplicable types.
1098+
/// for all applicable types.
10991099
pub is_auto: bool,
11001100
/// Whether the trait is marked as `unsafe`.
11011101
pub is_unsafe: bool,
@@ -1205,7 +1205,7 @@ pub struct ProcMacro {
12051205
}
12061206

12071207
/// The way a [`ProcMacro`] is declared to be used.
1208-
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
1208+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
12091209
#[serde(rename_all = "snake_case")]
12101210
pub enum MacroKind {
12111211
/// A bang macro `foo!()`.

0 commit comments

Comments
 (0)