diff options
| author | bors <bors@rust-lang.org> | 2019-09-28 22:42:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-28 22:42:58 +0000 |
| commit | b61e69433951e31f7bd746e22f516a48ad41623b (patch) | |
| tree | 255b133e7b09bfc79a8a45a26d1ab4b66e700a76 /src/libstd | |
| parent | 488381ce9ef0ceabe83b73127c659e5d38137df0 (diff) | |
| parent | 46526718b15dd168543a59cb632bf8dea6eedafe (diff) | |
| download | rust-b61e69433951e31f7bd746e22f516a48ad41623b.tar.gz rust-b61e69433951e31f7bd746e22f516a48ad41623b.zip | |
Auto merge of #64883 - Centril:rollup-uehjt63, r=Centril
Rollup of 10 pull requests Successful merges: - #64131 (data_structures: Add deterministic FxHashMap and FxHashSet wrappers) - #64387 (Fix redundant semicolon lint interaction with proc macro attributes) - #64678 (added more context for duplicate lang item errors (fixes #60561)) - #64763 (Add E0734 and its long explanation) - #64793 (Fix format macro expansions spans to be macro-generated) - #64837 (Improve wording in documentation of MaybeUninit) - #64852 (Print ParamTy span when accessing a field (#52082)) - #64875 (Upgrade async/await to "used" keywords.) - #64876 (Fix typo in intrinsics op safety) - #64880 (Slice docs: fix typo) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 02f664760c0..3e389c40fbc 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -567,7 +567,7 @@ mod prim_array { } #[doc(alias = "]")] #[doc(alias = "[]")] /// A dynamically-sized view into a contiguous sequence, `[T]`. Contiguous here -/// means that elements are layed out so that every element is the same +/// means that elements are laid out so that every element is the same /// distance from its neighbors. /// /// *[See also the `std::slice` module](slice/index.html).* |