diff options
| author | bors <bors@rust-lang.org> | 2016-10-26 14:58:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 14:58:16 -0700 |
| commit | c59cb71d976ceabf00c7da0224a795fab530601e (patch) | |
| tree | 7b07c6b19df2843426f2ee453317a2a4d9fd44b3 /src/libsyntax | |
| parent | 3a25b65c1fbdd6101b77e8a8b06a5e42d775dc3f (diff) | |
| parent | 48b022838b28d046e127d24caa6a9dee5460fa08 (diff) | |
| download | rust-c59cb71d976ceabf00c7da0224a795fab530601e.tar.gz rust-c59cb71d976ceabf00c7da0224a795fab530601e.zip | |
Auto merge of #37419 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 7 pull requests - Successful merges: #36206, #37144, #37391, #37394, #37396, #37398, #37414 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 954fe330b54..7143a26d133 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -1317,7 +1317,7 @@ pub enum UnstableFeatures { /// Hard errors for unstable features are active, as on /// beta/stable channels. Disallow, - /// Allow features to me activated, as on nightly. + /// Allow features to be activated, as on nightly. Allow, /// Errors are bypassed for bootstrapping. This is required any time /// during the build that feature-related lints are set to warn or above |