about summary refs log tree commit diff
path: root/src/librustdoc/test.rs
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-07-14 20:45:44 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2018-07-14 20:45:44 +0200
commit65e6b2b4a8f01e453e2bc27df9e0f0666904af42 (patch)
tree8012a448699589b2c7bb179a86549657c34beb08 /src/librustdoc/test.rs
parent6cc42a4488d5dbc4c4109ed4a2f2ea81efa77f86 (diff)
downloadrust-65e6b2b4a8f01e453e2bc27df9e0f0666904af42.tar.gz
rust-65e6b2b4a8f01e453e2bc27df9e0f0666904af42.zip
Pass edition flags to compiler from rustdoc as expected
Diffstat (limited to 'src/librustdoc/test.rs')
-rw-r--r--src/librustdoc/test.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 53032b9b98c..eb57ca74755 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -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;
 
@@ -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,