diff options
| author | bors <bors@rust-lang.org> | 2020-07-04 01:09:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-04 01:09:09 +0000 |
| commit | dbf3ae7c3beb5b493375bf76152e490b8cc81d1c (patch) | |
| tree | a111c237b1c83c00b98e8499fa186ab0fa1cf111 /src/libcore | |
| parent | 9a13ef2251531d5856ca62dd8822c9b8139f479a (diff) | |
| parent | d69a8468fa56199037d96b39f9827a5fb3302c12 (diff) | |
| download | rust-dbf3ae7c3beb5b493375bf76152e490b8cc81d1c.tar.gz rust-dbf3ae7c3beb5b493375bf76152e490b8cc81d1c.zip | |
Auto merge of #74019 - Manishearth:rollup-2st3jsk, r=Manishearth
Rollup of 12 pull requests Successful merges: - #73140 (Fallback to xml.etree.ElementTree) - #73670 (Add `format_args_capture` feature) - #73693 (Use exhaustive match in const_prop.rs) - #73845 (Use &raw in A|Rc::as_ptr) - #73861 (Create E0768) - #73881 (Standardize bibliographic citations in rustc API docs) - #73925 (Improve comments from #72617, as suggested by RalfJung) - #73949 ([mir-opt] Fix mis-optimization and other issues with the SimplifyArmIdentity pass) - #73984 (Edit docs for rustc_data_structures::graph::scc) - #73985 (Fix "getting started" link) - #73997 (fix typo) - #73999 (Bump mingw-check CI image from Ubuntu 16.04 to 18.04.) Failed merges: - #74000 (add `lazy_normalization_consts` feature gate) r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/marker.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 6040dd31847..fdcfae8530a 100644 --- 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; } |