Rollup merge of rust-lang#73997 - rust-lang:lcnr-patch-1, r=jonas-schievink

Manishearth · web-flow · commit e005c972554b · 2020-07-03T17:17:09.000-07:00
fix typo r? @Dylan-DPC
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
@@ -694,7 +694,7 @@ mod impls {
 )]
 #[lang = "discriminant_kind"]
 pub trait DiscriminantKind {
-    /// The type of the dicriminant, which must satisfy the trait
+    /// The type of the discriminant, which must satisfy the trait
     /// bounds required by `mem::Discriminant`.
     type Discriminant: Clone + Copy + Debug + Eq + PartialEq + Hash + Send + Sync + Unpin;
 }

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ mod impls {`
`694`	`694`	`)]`
`695`	`695`	`#[lang = "discriminant_kind"]`
`696`	`696`	`pub trait DiscriminantKind {`
`697`		`- /// The type of the dicriminant, which must satisfy the trait`
	`697`	`+ /// The type of the discriminant, which must satisfy the trait`
`698`	`698`	/// bounds required by `mem::Discriminant`.
`699`	`699`	`type Discriminant: Clone + Copy + Debug + Eq + PartialEq + Hash + Send + Sync + Unpin;`
`700`	`700`	`}`