diff options
| author | bors <bors@rust-lang.org> | 2018-10-24 19:58:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-24 19:58:23 +0000 |
| commit | da5f414c2c0bfe5198934493f04c676e2b23ff2e (patch) | |
| tree | 77e27fd6f1bcc0912e4a1085ddfc6f5c9861ecfc /src/librustdoc | |
| parent | f33946f81adec4739b84975805dcdeeb77f5a039 (diff) | |
| parent | 4a0c8d12f73e93af70e363fced9f335d26eb149d (diff) | |
| download | rust-1.30.0.tar.gz rust-1.30.0.zip | |
Auto merge of #55315 - pietroalbini:release-1.30.0, r=Mark-Simulacrum 1.30.0
Stable release 1.30 This PR also reverts the stabilization of `non_modrs_mods` and the 2018 edition. r? @Mark-Simulacrum cc @rust-lang/release
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index e9fac23b767..3a70c55e173 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -286,7 +286,7 @@ fn opts() -> Vec<RustcOptGroup> { \"light-suffix.css\"", "PATH") }), - stable("edition", |o| { + unstable("edition", |o| { o.optopt("", "edition", "edition to use when compiling rust code (default: 2015)", "EDITION") |