]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #34479 - ollie27:rustdoc_renamed_reexport_list, r=GuillaumeGomez
authorGuillaume Gomez <guillaume1.gomez@gmail.com>
Tue, 28 Jun 2016 14:05:15 +0000 (16:05 +0200)
committerGitHub <noreply@github.com>
Tue, 28 Jun 2016 14:05:15 +0000 (16:05 +0200)
rustdoc: Fix inlined renamed reexports in import lists

Fixes #34473

1  2 
src/librustdoc/visit_ast.rs

index 92424f113f987e806693e759028c9200db9d5ebb,020d6f80c595daf2dd49cd647a7f7554fa9bf54a..0334c5ef5c4f4397120d1408d1f8aa6227c8e5f8
@@@ -18,7 -18,7 +18,7 @@@ use syntax::abi
  use syntax::ast;
  use syntax::attr;
  use syntax::attr::AttrMetaMethods;
 -use syntax::codemap::Span;
 +use syntax_pos::Span;
  
  use rustc::hir::map as hir_map;
  use rustc::hir::def::Def;
@@@ -189,8 -189,8 +189,8 @@@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx
              }
              hir::ViewPathList(p, paths) => {
                  let mine = paths.into_iter().filter(|path| {
-                     !self.maybe_inline_local(path.node.id(), None, false, om,
-                                      please_inline)
+                     !self.maybe_inline_local(path.node.id(), path.node.rename(),
+                                              false, om, please_inline)
                  }).collect::<hir::HirVec<hir::PathListItem>>();
  
                  if mine.is_empty() {