bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #46134 - GuillaumeGomez:negative-traits, r=QuietMisdreavus

Browse source 
Display negative traits implementation

Fixes #45816.

r? @QuietMisdreavus
This commit is contained in:
kennytm 2017-11-22 01:13:02 +08:00 • committed by GitHub
commit 3bf1328005
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/librustdoc/html/render.rs
View file

@ -3680,18 +3680,24 @@ fn sidebar_assoc_items(it: &clean::Item) -> String {
}
let mut links = HashSet::new();
let ret = v.iter()
.filter_map(|i| if let Some(ref i) = i.inner_impl().trait_ {
let i_display = format!("{:#}", i);
let out = Escape(&i_display);
let encoded = small_url_encode(&format!("{:#}", i));
let generated = format!("<a href=\"#impl-{}\">{}</a>", encoded, out);
if !links.contains(&generated) && links.insert(generated.clone()) {
Some(generated)
.filter_map(|i| {
let is_negative_impl = is_negative_impl(i.inner_impl());
if let Some(ref i) = i.inner_impl().trait_ {
let i_display = format!("{:#}", i);
let out = Escape(&i_display);
let encoded = small_url_encode(&format!("{:#}", i));
let generated = format!("<a href=\"#impl-{}\">{}{}</a>",
encoded,
if is_negative_impl { "!" } else { "" },
out);
if !links.contains(&generated) && links.insert(generated.clone()) {
Some(generated)
} else {
None
}
} else {
None
}
} else {
None
})
.collect::<String>();
if !ret.is_empty() {
@ -3738,6 +3744,10 @@ fn extract_for_impl_name(item: &clean::Item) -> Option<(String, String)> {
}
}
fn is_negative_impl(i: &clean::Impl) -> bool {
i.polarity == Some(clean::ImplPolarity::Negative)
}
fn sidebar_trait(fmt: &mut fmt::Formatter, it: &clean::Item,
t: &clean::Trait) -> fmt::Result {
let mut sidebar = String::new();