diff options
| author | bors <bors@rust-lang.org> | 2020-01-31 15:13:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-31 15:13:51 +0000 |
| commit | 5371ddf8c6937e90ffb279c24ac3e79d17833399 (patch) | |
| tree | e039c56153743ae4dc03e5b345143bfb40708b41 /src/test/ui/allocator | |
| parent | ecde10fc283530db0db42e2c3e2e3132e809b139 (diff) | |
| parent | 45832839087da140eeb2a85a8b98927ec27ba21c (diff) | |
| download | rust-5371ddf8c6937e90ffb279c24ac3e79d17833399.tar.gz rust-5371ddf8c6937e90ffb279c24ac3e79d17833399.zip | |
Auto merge of #68080 - varkor:declared-here, r=petrochenkov
Address inconsistency in using "is" with "declared here" "is" was generally used for NLL diagnostics, but not other diagnostics. Using "is" makes the diagnostics sound more natural and readable, so it seems sensible to commit to them throughout. r? @Centril
Diffstat (limited to 'src/test/ui/allocator')
| -rw-r--r-- | src/test/ui/allocator/two-allocators.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr index 35d9f0f42f0..da636a5a567 100644 --- a/src/test/ui/allocator/two-allocators.stderr +++ b/src/test/ui/allocator/two-allocators.stderr @@ -2,7 +2,7 @@ error: cannot define multiple global allocators --> $DIR/two-allocators.rs:6:1 | LL | static A: System = System; - | -------------------------- previous global allocator is defined here + | -------------------------- previous global allocator defined here LL | #[global_allocator] LL | static B: System = System; | ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot define a new global allocator |