Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 96888f7

Browse files
authored
Unrolled build for rust-lang#131976
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 662180b + afa75f0 commit 96888f7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/rustdoc-json-types/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@ pub enum AssocItemConstraintKind {
305305
// FIXME(aDotInTheVoid): Consider making this non-public in rustdoc-types.
306306
pub struct Id(pub u32);
307307

308-
/// The fundamental kind of an item. Unlike [`ItemEnum`], this does not carry any aditional info.
308+
/// The fundamental kind of an item. Unlike [`ItemEnum`], this does not carry any additional info.
309309
///
310310
/// Part of [`ItemSummary`].
311-
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
311+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
312312
#[serde(rename_all = "snake_case")]
313313
pub enum ItemKind {
314314
/// A module declaration, e.g. `mod foo;` or `mod foo {}`
@@ -698,7 +698,7 @@ pub enum Abi {
698698
Aapcs { unwind: bool },
699699
/// Can be specified as `extern "win64"`.
700700
Win64 { unwind: bool },
701-
/// Can be specifed as `extern "sysv64"`.
701+
/// Can be specified as `extern "sysv64"`.
702702
SysV64 { unwind: bool },
703703
/// Can be specified as `extern "system"`.
704704
System { unwind: bool },
@@ -892,7 +892,7 @@ pub enum GenericBound {
892892
}
893893

894894
/// A set of modifiers applied to a trait.
895-
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
895+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
896896
#[serde(rename_all = "snake_case")]
897897
pub enum TraitBoundModifier {
898898
/// Marks the absence of a modifier.
@@ -996,7 +996,7 @@ pub enum Type {
996996
QualifiedPath {
997997
/// The name of the associated type in the parent type.
998998
///
999-
/// ```ignore (incomplete expresssion)
999+
/// ```ignore (incomplete expression)
10001000
/// <core::array::IntoIter<u32, 42> as Iterator>::Item
10011001
/// // ^^^^
10021002
/// ```
@@ -1083,7 +1083,7 @@ pub struct FunctionSignature {
10831083
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
10841084
pub struct Trait {
10851085
/// Whether the trait is marked `auto` and is thus implemented automatically
1086-
/// for all aplicable types.
1086+
/// for all applicable types.
10871087
pub is_auto: bool,
10881088
/// Whether the trait is marked as `unsafe`.
10891089
pub is_unsafe: bool,
@@ -1193,7 +1193,7 @@ pub struct ProcMacro {
11931193
}
11941194

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

0 commit comments

Comments
 (0)