Restore the old behavior of the rustdoc keyword check + Fix rebase

2019-05-13 22:46:20 +03:00 · 2019-05-13 22:46:20 +03:00 · a1885cdba3
commit a1885cdba3
parent c389a39c97
13 changed files with 44 additions and 41 deletions
--- a/src/libsyntax/test.rs
+++ b/src/libsyntax/test.rs
@ -215,7 +215,7 @@ fn mk_reexport_mod(cx: &mut TestCtxt<'_>,
                   tests: Vec<Ident>,
                   tested_submods: Vec<(Ident, Ident)>)
                   -> (P<ast::Item>, Ident) {
-    let super_ = Ident::with_empty_ctxt(keywords::Super.name());
+    let super_ = Ident::with_empty_ctxt(kw::Super);

    let items = tests.into_iter().map(|r| {
        cx.ext_cx.item_use_simple(DUMMY_SP, dummy_spanned(ast::VisibilityKind::Public),