Skip to content

Commit 655600b

Browse files
committed
auto merge of #16621 : tshepang/rust/grammar, r=steveklabnik
2 parents cb5967e + 1f1620e commit 655600b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/doc/complement-design-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% The Rust Design FAQ
22

3-
This document describes decisions were arrived at after lengthy discussion and
3+
This document describes decisions that were arrived at after lengthy discussion and
44
experimenting with alternatives. Please do not propose reversing them unless
55
you have a new, extremely compelling argument. Note that this document
66
specifically talks about the *language* and not any library or implementation.

src/doc/guide-unsafe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ possible in two ways: the `#[start]` attribute, or overriding the
446446
default shim for the C `main` function with your own.
447447

448448
The function marked `#[start]` is passed the command line parameters
449-
in the same format as a C:
449+
in the same format as C:
450450

451451
```
452452
#![no_std]
@@ -593,7 +593,7 @@ standard library itself.
593593
# Interacting with the compiler internals
594594

595595
> **Note**: this section is specific to the `rustc` compiler; these
596-
> parts of the language may never be full specified and so details may
596+
> parts of the language may never be fully specified and so details may
597597
> differ wildly between implementations (and even versions of `rustc`
598598
> itself).
599599
>

src/libserialize/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn main() {
106106
107107
## Using the `ToJson` trait
108108
109-
The examples above use the `ToJson` trait to generate the JSON string, which required
109+
The examples above use the `ToJson` trait to generate the JSON string, which is required
110110
for custom mappings.
111111
112112
### Simple example of `ToJson` usage

0 commit comments

Comments
 (0)