From 9be526e8ebfd318ecc5c6d5a6c40886dffb1be95 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sun, 24 Nov 2019 14:37:46 +0300 Subject: rustc_metadata: Move `has_global_allocator` from session to cstore --- src/test/ui/allocator/two-allocators3.stderr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/test/ui/allocator') 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 -- cgit 1.4.1-3-g733a5