Skip to content

Commit

Permalink
Rollup merge of rust-lang#48473 - GuillaumeGomez:rustdoc-auto-trait-i…
Browse files Browse the repository at this point in the history
…mpl-fix, r=QuietMisdreavus

Fix auto trait impl rustdoc ice

Fixes rust-lang#48463.

r? @QuietMisdreavus
  • Loading branch information
kennytm authored Feb 27, 2018
2 parents b106016 + 23dc694 commit d93440c
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustdoc/clean/auto_trait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl<'a, 'tcx, 'rcx> AutoTraitFinder<'a, 'tcx, 'rcx> {
AdtKind::Struct => Def::Struct,
AdtKind::Enum => Def::Enum,
AdtKind::Union => Def::Union,
},
}
_ => panic!("Unexpected type {:?}", def_id),
};

Expand Down
6 changes: 5 additions & 1 deletion src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3428,7 +3428,11 @@ fn build_deref_target_impls(cx: &DocContext,
let primitive = match *target {
ResolvedPath { did, .. } if did.is_local() => continue,
ResolvedPath { did, .. } => {
ret.extend(inline::build_impls(cx, did, true));
// We set the last parameter to false to avoid looking for auto-impls for traits
// and therefore avoid an ICE.
// The reason behind this is that auto-traits don't propagate through Deref so
// we're not supposed to synthesise impls for them.
ret.extend(inline::build_impls(cx, did, false));
continue
}
_ => match target.primitive_type() {
Expand Down
26 changes: 26 additions & 0 deletions src/test/rustdoc/auto-impl-for-trait.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Copyright 2018 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.

// Test for https://github.com/rust-lang/rust/issues/48463 issue.

use std::any::Any;
use std::ops::Deref;

pub struct AnyValue {
val: Box<Any>,
}

impl Deref for AnyValue {
type Target = Any;

fn deref(&self) -> &Any {
&*self.val
}
}

0 comments on commit d93440c

Please sign in to comment.