diff options
| author | bors <bors@rust-lang.org> | 2023-10-05 17:50:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-05 17:50:50 +0000 |
| commit | cdca82c2c853c8373c0c333a2fd7d1b480d7f1d2 (patch) | |
| tree | 5d3c77c2855c6e45b6f44f420542d94cd34f4719 /tests/ui/allocator | |
| parent | 3bcad65fbf67b6edf87c949531fbc13435882e6b (diff) | |
| parent | 76d0b794cb5eb618b13e444b2d28ce59ada01efe (diff) | |
| download | rust-cdca82c2c853c8373c0c333a2fd7d1b480d7f1d2.tar.gz rust-cdca82c2c853c8373c0c333a2fd7d1b480d7f1d2.zip | |
Auto merge of #116455 - matthiaskrgr:rollup-p226a5u, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #116220 (stabilize `Option::as_`(`mut_`)`slice`) - #116288 (Add Span to various smir types) - #116415 (Move subtyper below reveal_all and change reveal_all) - #116428 (Add a note to duplicate diagnostics) - #116452 (Do not assert that hidden types don't have erased regions.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/allocator')
| -rw-r--r-- | tests/ui/allocator/not-an-allocator.stderr | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/ui/allocator/not-an-allocator.stderr b/tests/ui/allocator/not-an-allocator.stderr index 62bb0679f81..e1967b70013 100644 --- a/tests/ui/allocator/not-an-allocator.stderr +++ b/tests/ui/allocator/not-an-allocator.stderr @@ -18,6 +18,7 @@ LL | static A: usize = 0; | ^^^^^ the trait `GlobalAlloc` is not implemented for `usize` | = help: the trait `GlobalAlloc` is implemented for `System` + = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` = note: this error originates in the attribute macro `global_allocator` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: the trait bound `usize: GlobalAlloc` is not satisfied @@ -29,6 +30,7 @@ LL | static A: usize = 0; | ^^^^^ the trait `GlobalAlloc` is not implemented for `usize` | = help: the trait `GlobalAlloc` is implemented for `System` + = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` = note: this error originates in the attribute macro `global_allocator` (in Nightly builds, run with -Z macro-backtrace for more info) error[E0277]: the trait bound `usize: GlobalAlloc` is not satisfied @@ -40,6 +42,7 @@ LL | static A: usize = 0; | ^^^^^ the trait `GlobalAlloc` is not implemented for `usize` | = help: the trait `GlobalAlloc` is implemented for `System` + = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` = note: this error originates in the attribute macro `global_allocator` (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 4 previous errors |