Skip to content

Commit

Permalink
Rollup merge of rust-lang#51183 - teiesti:rustdoc-book-termination, r…
Browse files Browse the repository at this point in the history
…=steveklabnik

Update rustdoc book to suggest using Termination trait instead of hidden ‘foo’ function

Closes rust-lang#50721.

I suggest that someone double-checks my English since I am not a native speaker.

r? @steveklabnik
  • Loading branch information
Mark-Simulacrum authored Jun 5, 2018
2 parents bcba3b9 + 089da06 commit 1225faf
Showing 1 changed file with 30 additions and 11 deletions.
41 changes: 30 additions & 11 deletions src/doc/rustdoc/src/documentation-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,37 +170,56 @@ By repeating all parts of the example, you can ensure that your example still
compiles, while only showing the parts that are relevant to that part of your
explanation.
Another case where the use of `#` is handy is when you want to ignore
error handling. Lets say you want the following,
## Using `?` in doc tests
When writing an example, it is rarely useful to include a complete error
handling, as it would add significant amounts of boilerplate code. Instead, you
may want the following:
```ignore
/// ```
/// use std::io;
/// let mut input = String::new();
/// io::stdin().read_line(&mut input)?;
/// ```
```

The problem is that `?` returns a `Result<T, E>` and test functions
don't return anything so this will give a mismatched types error.
The problem is that `?` returns a `Result<T, E>` and test functions don't
return anything, so this will give a mismatched types error.

You can get around this limitation by manually adding a `main` that returns
`Result<T, E>`, because `Result<T, E>` implements the `Termination` trait:

```ignore
/// A doc test using ?
///
/// ```
/// use std::io;
/// # fn foo() -> io::Result<()> {
///
/// fn main() -> io::Result<()> {
/// let mut input = String::new();
/// io::stdin().read_line(&mut input)?;
/// Ok(())
/// }
/// ```
```

Together with the `# ` from the section above, you arrive at a solution that
appears to the reader as the initial idea but works with doc tests:

```ignore
/// ```
/// use std::io;
/// # fn main() -> io::Result<()> {
/// let mut input = String::new();
/// io::stdin().read_line(&mut input)?;
/// # Ok(())
/// # }
/// ```
# fn foo() {}
```

You can get around this by wrapping the code in a function. This catches
and swallows the `Result<T, E>` when running tests on the docs. This
pattern appears regularly in the standard library.

### Documenting macros
## Documenting macros

Here’s an example of documenting a macro:

Expand Down

0 comments on commit 1225faf

Please sign in to comment.