diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-11-24 14:37:46 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-11-28 20:59:57 +0300 |
| commit | 9be526e8ebfd318ecc5c6d5a6c40886dffb1be95 (patch) | |
| tree | 4112dff7b4997c7eb5480c31f9c027337a1ce10b /src/test/ui/allocator | |
| parent | 4c8105e8b743ce1742a91a07dca3b5a23f72178b (diff) | |
| download | rust-9be526e8ebfd318ecc5c6d5a6c40886dffb1be95.tar.gz rust-9be526e8ebfd318ecc5c6d5a6c40886dffb1be95.zip | |
rustc_metadata: Move `has_global_allocator` from session to cstore
Diffstat (limited to 'src/test/ui/allocator')
| -rw-r--r-- | src/test/ui/allocator/two-allocators3.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/allocator/two-allocators3.stderr b/src/test/ui/allocator/two-allocators3.stderr index ecffb192e2a..a3079113d01 100644 --- a/src/test/ui/allocator/two-allocators3.stderr +++ b/src/test/ui/allocator/two-allocators3.stderr @@ -1,4 +1,4 @@ -error: the `#[global_allocator]` in system_allocator conflicts with this global allocator in: system_allocator2 +error: the `#[global_allocator]` in system_allocator conflicts with global allocator in: system_allocator2 error: aborting due to previous error |