Rollup merge of #54350 - Munksgaard:support-edition-in-doc-test, r=steveklabnik

[rust.git] / src / librustdoc / test.rs

diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 8a9ca924ee1ab997e06c3f74c55890c3a7553ec5..dbebc3ab393977a0e226e20dabeb03607e0d757a 100644 (file)
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -545,7 +545,7 @@ pub fn add_test(&mut self, test: String, config: LangString, line: usize) {
         let opts = self.opts.clone();
         let maybe_sysroot = self.maybe_sysroot.clone();
         let linker = self.linker.clone();
-        let edition = self.edition;
+        let edition = config.edition.unwrap_or(self.edition);
         debug!("Creating test {}: {}", name, test);
         self.tests.push(testing::TestDescAndFn {
             desc: testing::TestDesc {