Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustdoc: Render where clauses as appropriate
Fix #16546
- Loading branch information
1 parent
5e13d3a
commit 54831f1
Showing
6 changed files
with
131 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
-include ../tools.mk | ||
|
||
all: verify.sh foo.rs | ||
$(HOST_RPATH_ENV) $(RUSTDOC) -w html -o $(TMPDIR)/doc foo.rs | ||
cp verify.sh $(TMPDIR) | ||
$(call RUN,verify.sh) $(TMPDIR) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Copyright 2014 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. | ||
|
||
pub trait MyTrait {} | ||
|
||
pub struct Alpha<A> where A: MyTrait; | ||
pub trait Bravo<B> where B: MyTrait {} | ||
pub fn charlie<C>() where C: MyTrait {} | ||
|
||
pub struct Delta<D>; | ||
impl<D> Delta<D> where D: MyTrait { | ||
pub fn delta() {} | ||
} | ||
|
||
pub struct Echo<E>; | ||
impl<E> MyTrait for Echo<E> where E: MyTrait {} | ||
|
||
pub enum Foxtrot<F> {} | ||
impl<F> MyTrait for Foxtrot<F> where F: MyTrait {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
# $1 is the TMPDIR | ||
DOC=$1/doc/foo | ||
|
||
grep "Alpha.*where.*A:.*MyTrait" $DOC/struct.Alpha.html > /dev/null | ||
echo "Alpha" | ||
grep "Bravo.*where.*B:.*MyTrait" $DOC/trait.Bravo.html > /dev/null | ||
echo "Bravo" | ||
grep "charlie.*where.*C:.*MyTrait" $DOC/fn.charlie.html > /dev/null | ||
echo "Charlie" | ||
grep "impl.*Delta.*where.*D:.*MyTrait" $DOC/struct.Delta.html > /dev/null | ||
echo "Delta" | ||
grep "impl.*MyTrait.*for.*Echo.*where.*E:.*MyTrait" $DOC/struct.Echo.html > /dev/null | ||
echo "Echo" | ||
grep "impl.*MyTrait.*for.*Foxtrot.*where.*F:.*MyTrait" $DOC/enum.Foxtrot.html > /dev/null | ||
echo "Foxtrot" | ||
|
||
# check "Implementors" section of MyTrait | ||
grep "impl.*MyTrait.*for.*Echo.*where.*E:.*MyTrait" $DOC/trait.MyTrait.html > /dev/null | ||
grep "impl.*MyTrait.*for.*Foxtrot.*where.*F:.*MyTrait" $DOC/trait.MyTrait.html > /dev/null | ||
echo "Implementors OK" |