diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-04 10:07:02 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-04 10:07:02 +0530 |
| commit | 8a39dffa7f3afc974073d8f62b9dfcb419e03f4e (patch) | |
| tree | e574c39b9628d3180e541690e7943079d5edae7f /src | |
| parent | 8c2806caaedc9b83868b14dcaf5f33420be9d368 (diff) | |
| parent | 01ddbe9f33f409a5274d36cd7f0609263eab4764 (diff) | |
| download | rust-8a39dffa7f3afc974073d8f62b9dfcb419e03f4e.tar.gz rust-8a39dffa7f3afc974073d8f62b9dfcb419e03f4e.zip | |
Rollup merge of #25987 - pnkfelix:fix-dropck-doc-formatto, r=Manishearth
Fix the dropck doc formatting to avoid hitting four-space indent. This was causing `rustdoc` to interpret the part starting with `(A.) ...` as a code block based on its four-space indentation, which then was treated by `rustdoc` as a *Rust* code snippet, and thus was attempting (and failing) to parse my english as Rust code. Thus causing the compiler-docs build to fail. Independently, we should probably change `rustdoc` to not interpret four-space indents as code that needs to be tested; it seems too perilous to me at least. (But the formatting here needed to be changed either way.) cc Issue #25699.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_typeck/check/dropck.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/librustc_typeck/check/dropck.rs b/src/librustc_typeck/check/dropck.rs index fd90d662bd1..28e48cb6f25 100644 --- a/src/librustc_typeck/check/dropck.rs +++ b/src/librustc_typeck/check/dropck.rs @@ -238,14 +238,12 @@ fn ensure_drop_predicates_are_implied_by_item_defn<'tcx>( /// Let `v` be some value (either temporary or named) and 'a be some /// lifetime (scope). If the type of `v` owns data of type `D`, where /// -/// (1.) `D` has a lifetime- or type-parametric Drop implementation, and -/// (2.) the structure of `D` can reach a reference of type `&'a _`, and -/// (3.) either: -/// -/// (A.) the Drop impl for `D` instantiates `D` at 'a directly, +/// * (1.) `D` has a lifetime- or type-parametric Drop implementation, and +/// * (2.) the structure of `D` can reach a reference of type `&'a _`, and +/// * (3.) either: +/// * (A.) the Drop impl for `D` instantiates `D` at 'a directly, /// i.e. `D<'a>`, or, -/// -/// (B.) the Drop impl for `D` has some type parameter with a +/// * (B.) the Drop impl for `D` has some type parameter with a /// trait bound `T` where `T` is a trait that has at least /// one method, /// |
