Auto merge of #38537 - jseyfried:fix_rustdoc_ice, r=nrc
Fix ICE in rustdoc Fixes #38237. r? @nrc
This commit is contained in:
commit
9351c2c8e7
@ -1006,6 +1006,7 @@ pub fn get_implementations_for_trait(&self, filter: Option<DefId>, result: &mut
|
||||
let filter = match filter.map(|def_id| self.reverse_translate_def_id(def_id)) {
|
||||
Some(Some(def_id)) => Some((def_id.krate.as_u32(), def_id.index)),
|
||||
Some(None) => return,
|
||||
None if self.proc_macros.is_some() => return,
|
||||
None => None,
|
||||
};
|
||||
|
||||
|
5
src/test/run-make/issue-38237/Makefile
Normal file
5
src/test/run-make/issue-38237/Makefile
Normal file
@ -0,0 +1,5 @@
|
||||
-include ../tools.mk
|
||||
|
||||
all:
|
||||
$(RUSTC) foo.rs; $(RUSTC) bar.rs
|
||||
$(RUSTDOC) baz.rs -L $(TMPDIR) -o $(TMPDIR)
|
14
src/test/run-make/issue-38237/bar.rs
Normal file
14
src/test/run-make/issue-38237/bar.rs
Normal file
@ -0,0 +1,14 @@
|
||||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![crate_type = "lib"]
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct S;
|
18
src/test/run-make/issue-38237/baz.rs
Normal file
18
src/test/run-make/issue-38237/baz.rs
Normal file
@ -0,0 +1,18 @@
|
||||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
extern crate foo;
|
||||
extern crate bar;
|
||||
|
||||
pub struct Bar;
|
||||
impl ::std::ops::Deref for Bar {
|
||||
type Target = bar::S;
|
||||
fn deref(&self) -> &Self::Target { unimplemented!() }
|
||||
}
|
20
src/test/run-make/issue-38237/foo.rs
Normal file
20
src/test/run-make/issue-38237/foo.rs
Normal file
@ -0,0 +1,20 @@
|
||||
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
#![crate_type = "proc-macro"]
|
||||
#![feature(proc_macro, proc_macro_lib)]
|
||||
|
||||
extern crate proc_macro;
|
||||
|
||||
#[proc_macro_derive(A)]
|
||||
pub fn derive(ts: proc_macro::TokenStream) -> proc_macro::TokenStream { ts }
|
||||
|
||||
#[derive(Debug)]
|
||||
struct S;
|
Loading…
Reference in New Issue
Block a user