Skip to content

Commit

Permalink
Pass edition flags to compiler from rustdoc as expected
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Jul 14, 2018
1 parent 6cc42a4 commit 65e6b2b
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustdoc/test.rs
Expand Up @@ -37,7 +37,7 @@ use syntax::codemap::CodeMap;
use syntax::edition::Edition;
use syntax::feature_gate::UnstableFeatures;
use syntax::with_globals;
use syntax_pos::{BytePos, DUMMY_SP, Pos, Span, FileName};
use syntax_pos::{BytePos, DUMMY_SP, Pos, Span, FileName, hygiene};
use errors;
use errors::emitter::ColorConfig;

Expand Down Expand Up @@ -561,6 +561,7 @@ impl Collector {
rustc_driver::in_rustc_thread(move || with_globals(move || {
io::set_panic(panic);
io::set_print(print);
hygiene::set_default_edition(edition);
run_test(&test,
&cratename,
&filename,
Expand Down
24 changes: 24 additions & 0 deletions src/test/rustdoc/edition-flag.rs
@@ -0,0 +1,24 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-flags:--test -Z unstable-options
// edition:2018

#![feature(async_await)]

/// ```rust
/// #![feature(async_await)]
/// fn main() {
/// let _ = async { };
/// }
/// ```
fn main() {
let _ = async { };
}

0 comments on commit 65e6b2b

Please sign in to comment.