diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-04-14 00:23:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-14 00:23:25 +0200 |
| commit | bdb264ff5f4ecb39e5c8babf594d355bc4795afc (patch) | |
| tree | bf10fc6164cf9db8de31cc7587ddf6f03f8f0aa7 /src/test/ui/allocator-submodule.stderr | |
| parent | e4c66afba5d69356879570aeff22db5a38566a86 (diff) | |
| parent | fc928a18bad0b6aa275a6908351b164f6f4abcd6 (diff) | |
Rollup merge of #59675 - SimonSapin:stable-alloc, r=alexcrichton
Stabilize the `alloc` crate. This implements RFC 2480: * https://github.com/rust-lang/rfcs/pull/2480 * https://github.com/rust-lang/rfcs/blob/master/text/2480-liballoc.md Closes https://github.com/rust-lang/rust/issues/27783
Diffstat (limited to 'src/test/ui/allocator-submodule.stderr')
| -rw-r--r-- | src/test/ui/allocator-submodule.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/allocator-submodule.stderr b/src/test/ui/allocator-submodule.stderr index 26d7aa80eee..91c7c0f6b8e 100644 --- a/src/test/ui/allocator-submodule.stderr +++ b/src/test/ui/allocator-submodule.stderr @@ -1,5 +1,5 @@ error: `global_allocator` cannot be used in submodules - --> $DIR/allocator-submodule.rs:27:5 + --> $DIR/allocator-submodule.rs:25:5 | LL | static MY_HEAP: MyAlloc = MyAlloc; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |