diff options
| author | bors <bors@rust-lang.org> | 2020-04-03 13:42:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-03 13:42:08 +0000 |
| commit | f6fe99c798cb65280a9a56f442b371adcb7b8aa2 (patch) | |
| tree | c35a82154a7b29f313d43ce08a69616c585231fd /src/libstd | |
| parent | 34f7f55e7aad1cedbddf6fecb4f293377d0cfd1d (diff) | |
| parent | 04824f302a9d28e6437d2ad0749c9e3cc4f36b9e (diff) | |
| download | rust-f6fe99c798cb65280a9a56f442b371adcb7b8aa2.tar.gz rust-f6fe99c798cb65280a9a56f442b371adcb7b8aa2.zip | |
Auto merge of #70734 - Dylan-DPC:rollup-xmncatq, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #70696 (Extend #69020 test to include reversed operand order.) - #70706 (Minor cleanup in rustdoc --check-theme) - #70725 (Avoid `.unwrap()`s on `.span_to_snippet(...)`s) - #70728 (Minor doc improvements on `AllocRef`) - #70730 (Fix link in task::Wake docs) - #70731 (Minor follow-up after renaming librustc(_middle)) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/alloc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs index bbbf6f7251e..9840cfa4304 100644 --- a/src/libstd/alloc.rs +++ b/src/libstd/alloc.rs @@ -289,10 +289,10 @@ pub fn rust_oom(layout: Layout) -> ! { pub mod __default_lib_allocator { use super::{GlobalAlloc, Layout, System}; // These magic symbol names are used as a fallback for implementing the - // `__rust_alloc` etc symbols (see `src/liballoc/alloc.rs) when there is + // `__rust_alloc` etc symbols (see `src/liballoc/alloc.rs`) when there is // no `#[global_allocator]` attribute. - // for symbol names src/librustc_middle/middle/allocator.rs + // for symbol names src/librustc_ast/expand/allocator.rs // for signatures src/librustc_allocator/lib.rs // linkage directives are provided as part of the current compiler allocator |