Skip to content

Commit

Permalink
Rollup merge of rust-lang#24490 - lstat:doc-typo, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
steveklabnik committed Apr 16, 2015
2 parents 526abe8 + c1f6d6a commit 72a1e6b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/doc/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2368,7 +2368,7 @@ The currently implemented features of the reference compiler are:
removed entirely for something more wholesome.

* `custom_attribute` - Allows the usage of attributes unknown to the compiler
so that new attributes can be added in a bacwards compatible
so that new attributes can be added in a backwards compatible
manner (RFC 572).

* `custom_derive` - Allows the use of `#[derive(Foo,Bar)]` as sugar for
Expand Down Expand Up @@ -2397,7 +2397,7 @@ The currently implemented features of the reference compiler are:
nasty hack that will certainly be removed.

* `main` - Allows use of the `#[main]` attribute, which changes the entry point
into a Rust program. This capabiilty is subject to change.
into a Rust program. This capability is subject to change.

* `macro_reexport` - Allows macros to be re-exported from one crate after being imported
from another. This feature was originally designed with the sole
Expand Down Expand Up @@ -2453,7 +2453,7 @@ The currently implemented features of the reference compiler are:
is unintuitive and suboptimal.

* `start` - Allows use of the `#[start]` attribute, which changes the entry point
into a Rust program. This capabiilty, especially the signature for the
into a Rust program. This capability, especially the signature for the
annotated function, is subject to change.

* `struct_inherit` - Allows using struct inheritance, which is barely
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

//! Feature gating
//!
//! This modules implements the gating necessary for preventing certain compiler
//! This module implements the gating necessary for preventing certain compiler
//! features from being used by default. This module will crawl a pre-expanded
//! AST to ensure that there are no features which are used that are not
//! enabled.
Expand Down

0 comments on commit 72a1e6b

Please sign in to comment.