diff options
| author | bors <bors@rust-lang.org> | 2017-07-08 19:50:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-08 19:50:13 +0000 |
| commit | 720c596ec62e8fec855c2953f21b0118ae408bdd (patch) | |
| tree | 6c5e1e870bc3fbabd524c864508fcfb358b9fffd | |
| parent | b695889fd62b96292d788b2543926e2c201fb709 (diff) | |
| parent | 7386288e30bbd4bd2c65c93a3884fd7e307f5d82 (diff) | |
| download | rust-720c596ec62e8fec855c2953f21b0118ae408bdd.tar.gz rust-720c596ec62e8fec855c2953f21b0118ae408bdd.zip | |
Auto merge of #43075 - durka:error-long-link, r=nikomatsakis
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.
| -rw-r--r-- | src/librustc_typeck/diagnostics.rs | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 21ca62ff72b..87e59683fd2 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -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##" @@ -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: @@ -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##" @@ -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##" @@ -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##" |
