Skip to content

Commit

Permalink
Auto merge of #43075 - durka:error-long-link, r=nikomatsakis
Browse files Browse the repository at this point in the history
Fix links for typeck diagnostics without tripping tidy

Pick up #42624 to fix #43070 (cc @frewsxcv). I fixed a few other links while I was at it.
  • Loading branch information
bors committed Jul 8, 2017
2 parents b695889 + 7386288 commit 720c596
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions src/librustc_typeck/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ trait_obj.method_one();
trait_obj.method_two();
```
You can read more about trait objects in the Trait Object section of the
Reference:
You can read more about trait objects in the [Trait Objects] section of the
Reference.
https://doc.rust-lang.org/reference.html#trait-objects
[Trait Objects]: https://doc.rust-lang.org/reference/types.html#trait-objects
"##,

E0034: r##"
Expand Down Expand Up @@ -874,8 +874,9 @@ lvalue expression represents a memory location and can be a variable (with
optional namespacing), a dereference, an indexing expression or a field
reference.
More details can be found here:
https://doc.rust-lang.org/reference.html#lvalues-rvalues-and-temporaries
More details can be found in the [Expressions] section of the Reference.
[Expressions]: https://doc.rust-lang.org/reference/expressions.html#lvalues-rvalues-and-temporaries
Now, we can go further. Here are some erroneous code examples:
Expand Down Expand Up @@ -3467,10 +3468,10 @@ struct Foo<'a, T: 'a> {
}
```
PhantomData can also be used to express information about unused type
parameters. You can read more about it in the API documentation:
[PhantomData] can also be used to express information about unused type
parameters.
https://doc.rust-lang.org/std/marker/struct.PhantomData.html
[PhantomData]: https://doc.rust-lang.org/std/marker/struct.PhantomData.html
"##,

E0393: r##"
Expand Down Expand Up @@ -4342,7 +4343,9 @@ let variable = Foo { x: 0, y: -12 };
println!("x: {}, y: {}", variable.x, variable.y);
```
For more information see The Rust Book: https://doc.rust-lang.org/book/
For more information about primitives and structs, take a look at The Book:
https://doc.rust-lang.org/book/first-edition/primitive-types.html
https://doc.rust-lang.org/book/first-edition/structs.html
"##,

E0611: r##"
Expand Down Expand Up @@ -4560,9 +4563,10 @@ unsafe {
}
```
To fix this error, you need to pass variables corresponding to C types as much
as possible. For better explanations, see The Rust Book:
https://doc.rust-lang.org/book/
Certain Rust types must be cast before passing them to a variadic function,
because of arcane ABI rules dictated by the C standard. To fix the error,
cast the value to the type specified by the error message (which you may need
to import from `std::os::raw`).
"##,

E0618: r##"
Expand Down

0 comments on commit 720c596

Please sign in to comment.