diff options
| author | bors <bors@rust-lang.org> | 2019-04-13 22:24:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-13 22:24:33 +0000 |
| commit | 00856722bad5e9d96048319fb41f4b7e249820cd (patch) | |
| tree | 9c813b5a9ac58b59d765a510e2f03c84446b6962 /src/test/ui/allocator-submodule.stderr | |
| parent | e4c66afba5d69356879570aeff22db5a38566a86 (diff) | |
| parent | cf370b40dc9955ed3cff90f94b96507513ad6ded (diff) | |
Auto merge of #59949 - Centril:rollup-lsiqq1g, r=Centril
Rollup of 16 pull requests
Successful merges:
- #59675 (Stabilize the `alloc` crate.)
- #59708 (Mark variables captured by reference as mutable correctly)
- #59735 (remove lookup_char_pos_adj)
- #59747 (Copy book.toml unstable book generator)
- #59796 (Retire `IsNotConst` naming)
- #59804 (Clean up jobserver integration)
- #59818 (Eliminate `FnBox` usages from libstd.)
- #59830 (Fix links on keyword docs.)
- #59835 (Re-export NonZero signed variant in std)
- #59852 (std: Add `{read,write}_vectored` for more types)
- #59855 (Fix attributes position in type declaration)
- #59858 (Make duplicate matcher bindings a hard error)
- #59899 (In `-Zprint-type-size` output, sort enum variants by size.)
- #59912 (MaybeUninit: remove deprecated functions)
- #59925 (Fix paste error in split_ascii_whitespace docs.)
- #59930 (Exclude some copies of old book editions from search engines)
Failed merges:
r? @ghost
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; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |