Rollup merge of #68357 - ollie27:rustdoc_test_errors, r=GuillaumeGomez

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

diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs
index 95edff4ba80991d0c1802b05691923fd55d6976c..912a40722b8aff133c752ae4737a9a40b516c618 100644 (file)
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -2,10 +2,9 @@
 use std::io::prelude::*;
 use std::path::PathBuf;
 
-use errors;
 use rustc_feature::UnstableFeatures;
+use rustc_span::edition::Edition;
 use rustc_span::source_map::DUMMY_SP;
-use syntax::edition::Edition;
 use testing;
 
 use crate::config::{Options, RenderOptions};
@@ -39,7 +38,7 @@ fn extract_leading_metadata(s: &str) -> (Vec<&str>, &str) {
 pub fn render(
     input: PathBuf,
     options: RenderOptions,
-    diag: &errors::Handler,
+    diag: &rustc_errors::Handler,
     edition: Edition,
 ) -> i32 {
     let mut output = options.output;
@@ -128,7 +127,7 @@ pub fn render(
 }
 
 /// Runs any tests/code examples in the markdown file `input`.
-pub fn test(mut options: Options, diag: &errors::Handler) -> i32 {
+pub fn test(mut options: Options, diag: &rustc_errors::Handler) -> i32 {
     let input_str = match load_string(&options.input, diag) {
         Ok(s) => s,
         Err(LoadStringError::ReadFail) => return 1,