diff options
| author | bors <bors@rust-lang.org> | 2018-12-24 07:26:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-24 07:26:19 +0000 |
| commit | 94bf2c15eb3d072e92855a605783a29920df9e46 (patch) | |
| tree | c54866741b6c39b4ddce1f30ae136075ec936bc5 /src/test/ui/error-codes | |
| parent | e16928082aa2d66a4498132572b69156b94b25f1 (diff) | |
| parent | dff3e41914905eae0326c00de0dd9befc9d9ae83 (diff) | |
| download | rust-94bf2c15eb3d072e92855a605783a29920df9e46.tar.gz rust-94bf2c15eb3d072e92855a605783a29920df9e46.zip | |
Auto merge of #57087 - Centril:rollup, r=Centril
Rollup of 14 pull requests Successful merges: - #56188 (enum type instead of variant suggestion unification ) - #56342 (Improve docs for collecting into `Option`s) - #56916 (Fix mutable references in `static mut`) - #56917 (Simplify MIR generation for logical operations) - #56939 (Pin stabilization) - #56953 (Mark tuple structs as live if their constructors are used) - #56964 (Remove `TokenStream::JointTree`.) - #56966 (Correct strings for raw pointer deref and array access suggestions) - #57020 (Point to cause of `fn` expected return type) - #57032 (fix deprecation warnings in liballoc benches) - #57053 (Fix alignment for array indexing) - #57062 (Fix a comment) - #57067 (Stabilize min_const_unsafe_fn in 1.33) - #57078 (Ignore two tests on s390x) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0069.stderr | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/ui/error-codes/E0069.stderr b/src/test/ui/error-codes/E0069.stderr index 0ba1ed45663..12b778f42e2 100644 --- a/src/test/ui/error-codes/E0069.stderr +++ b/src/test/ui/error-codes/E0069.stderr @@ -1,8 +1,10 @@ error[E0069]: `return;` in a function whose return type is not `()` --> $DIR/E0069.rs:12:5 | +LL | fn foo() -> u8 { + | -- expected `u8` because of this return type LL | return; - | ^^^^^^ return type is not () + | ^^^^^^ return type is not `()` error: aborting due to previous error |