diff options
| author | bors <bors@rust-lang.org> | 2020-03-23 09:30:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-23 09:30:00 +0000 |
| commit | 5aa8f199c398644d9fc2bb9ac8cffd14f985686d (patch) | |
| tree | b5717a9698a99ed92df9da39c5edd0e0a53ce697 /src/test/ui/parser | |
| parent | 8ff785011be6625e32afceee3a08e5cff7470feb (diff) | |
| parent | 07e1043222a62443962b6691ff0131e57d73ce2d (diff) | |
| download | rust-5aa8f199c398644d9fc2bb9ac8cffd14f985686d.tar.gz rust-5aa8f199c398644d9fc2bb9ac8cffd14f985686d.zip | |
Auto merge of #70305 - Centril:rollup-zi13fz4, r=Centril
Rollup of 8 pull requests
Successful merges:
- #69080 (rustc_codegen_llvm: don't generate any type debuginfo for -Cdebuginfo=1.)
- #69940 (librustc_codegen_llvm: Replace deprecated API usage)
- #69942 (Increase verbosity when suggesting subtle code changes)
- #69968 (rustc: keep upvars tupled in {Closure,Generator}Substs.)
- #70123 (Ensure LLVM is in the link path for rustc tools)
- #70159 (Update the bundled wasi-libc with libstd)
- #70233 (resolve: Do not resolve visibilities on proc macro definitions twice)
- #70286 (Miri error type: remove UbExperimental variant)
Failed merges:
r? @ghost
Diffstat (limited to 'src/test/ui/parser')
| -rw-r--r-- | src/test/ui/parser/macro/pub-item-macro.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/parser/macro/pub-item-macro.stderr b/src/test/ui/parser/macro/pub-item-macro.stderr index 4ff96532e03..1c5613ac986 100644 --- a/src/test/ui/parser/macro/pub-item-macro.stderr +++ b/src/test/ui/parser/macro/pub-item-macro.stderr @@ -14,7 +14,7 @@ error[E0603]: static `x` is private --> $DIR/pub-item-macro.rs:20:23 | LL | let y: u32 = foo::x; - | ^ this static is private + | ^ private static | note: the static `x` is defined here --> $DIR/pub-item-macro.rs:5:9 |