summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2019-11-30 13:28:53 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2019-11-30 13:43:50 +0100
commit481b18acd09b480cc1ca50ea726cf91847f928f1 (patch)
tree5640f071072bdb54fedbc79990e0cdd752142b4a
parentAuto merge of #66873 - RalfJung:miri-args, r=dtolnay (diff)
downloadrust-481b18acd09b480cc1ca50ea726cf91847f928f1.tar.gz
rust-481b18acd09b480cc1ca50ea726cf91847f928f1.tar.bz2
rust-481b18acd09b480cc1ca50ea726cf91847f928f1.tar.xz
Small error codes explanation cleanup (E0092, E0093 and E0094)
-rw-r--r--src/librustc_error_codes/error_codes/E0092.md7
-rw-r--r--src/librustc_error_codes/error_codes/E0093.md8
-rw-r--r--src/librustc_error_codes/error_codes/E0094.md3
-rw-r--r--src/librustc_error_codes/error_codes/E0106.md4
4 files changed, 13 insertions, 9 deletions
diff --git a/src/librustc_error_codes/error_codes/E0092.md b/src/librustc_error_codes/error_codes/E0092.md
index 2750a7d..e289534 100644
--- a/src/librustc_error_codes/error_codes/E0092.md
+++ b/src/librustc_error_codes/error_codes/E0092.md
@@ -1,4 +1,5 @@
1You tried to declare an undefined atomic operation function. 1An undefined atomic operation function was declared.
2
2Erroneous code example: 3Erroneous code example:
3 4
4```compile_fail,E0092 5```compile_fail,E0092
@@ -11,8 +12,8 @@ extern "rust-intrinsic" {
11``` 12```
12 13
13Please check you didn't make a mistake in the function's name. All intrinsic 14Please check you didn't make a mistake in the function's name. All intrinsic
14functions are defined in librustc_codegen_llvm/intrinsic.rs and in 15functions are defined in `librustc_codegen_llvm/intrinsic.rs` and in
15libcore/intrinsics.rs in the Rust source code. Example: 16`libcore/intrinsics.rs` in the Rust source code. Example:
16 17
17``` 18```
18#![feature(intrinsics)] 19#![feature(intrinsics)]
diff --git a/src/librustc_error_codes/error_codes/E0093.md b/src/librustc_error_codes/error_codes/E0093.md
index 9633f79..8e7de1a 100644
--- a/src/librustc_error_codes/error_codes/E0093.md
+++ b/src/librustc_error_codes/error_codes/E0093.md
@@ -1,4 +1,6 @@
1You declared an unknown intrinsic function. Erroneous code example: 1An unknown intrinsic function was declared.
2
3Erroneous code example:
2 4
3```compile_fail,E0093 5```compile_fail,E0093
4#![feature(intrinsics)] 6#![feature(intrinsics)]
@@ -15,8 +17,8 @@ fn main() {
15``` 17```
16 18
17Please check you didn't make a mistake in the function's name. All intrinsic 19Please check you didn't make a mistake in the function's name. All intrinsic
18functions are defined in librustc_codegen_llvm/intrinsic.rs and in 20functions are defined in `librustc_codegen_llvm/intrinsic.rs` and in
19libcore/intrinsics.rs in the Rust source code. Example: 21`libcore/intrinsics.rs` in the Rust source code. Example:
20 22
21``` 23```
22#![feature(intrinsics)] 24#![feature(intrinsics)]
diff --git a/src/librustc_error_codes/error_codes/E0094.md b/src/librustc_error_codes/error_codes/E0094.md
index 4d27f61..42baa65 100644
--- a/src/librustc_error_codes/error_codes/E0094.md
+++ b/src/librustc_error_codes/error_codes/E0094.md
@@ -1,4 +1,5 @@
1You gave an invalid number of type parameters to an intrinsic function. 1An invalid number of type parameters was given to an intrinsic function.
2
2Erroneous code example: 3Erroneous code example:
3 4
4```compile_fail,E0094 5```compile_fail,E0094
diff --git a/src/librustc_error_codes/error_codes/E0106.md b/src/librustc_error_codes/error_codes/E0106.md
index 8a49c1f..60ca1dd 100644
--- a/src/librustc_error_codes/error_codes/E0106.md
+++ b/src/librustc_error_codes/error_codes/E0106.md
@@ -2,7 +2,7 @@ This error indicates that a lifetime is missing from a type. If it is an error
2inside a function signature, the problem may be with failing to adhere to the 2inside a function signature, the problem may be with failing to adhere to the
3lifetime elision rules (see below). 3lifetime elision rules (see below).
4 4
5Here are some simple examples of where you'll run into this error: 5Erroneous code examples:
6 6
7```compile_fail,E0106 7```compile_fail,E0106
8struct Foo1 { x: &bool } 8struct Foo1 { x: &bool }
@@ -27,7 +27,7 @@ function signatures which allows you to leave out lifetimes in certain cases.
27For more background on lifetime elision see [the book][book-le]. 27For more background on lifetime elision see [the book][book-le].
28 28
29The lifetime elision rules require that any function signature with an elided 29The lifetime elision rules require that any function signature with an elided
30output lifetime must either have 30output lifetime must either have:
31 31
32 - exactly one input lifetime 32 - exactly one input lifetime
33 - or, multiple input lifetimes, but the function must also be a method with a 33 - or, multiple input lifetimes, but the function must also be a method with a