about summary refs log tree commit diff
path: root/src/libcore/alloc.rs
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-10-25 14:31:13 +0200
committerGitHub <noreply@github.com>2018-10-25 14:31:13 +0200
commit4f14bfdc73338d9b49eebb3f905bfc3df47d6891 (patch)
tree1391b9932de51c2fae0d3ceb400e2bb677e23e6b /src/libcore/alloc.rs
parent88341a99398d740de8b82fff297731e68c9d2a75 (diff)
parent4972beaf65cad992a6ed791fdefe90e46c09aa7b (diff)
downloadrust-4f14bfdc73338d9b49eebb3f905bfc3df47d6891.tar.gz
rust-4f14bfdc73338d9b49eebb3f905bfc3df47d6891.zip
Rollup merge of #55269 - matthiaskrgr:typos_oct, r=zackmdavis
fix typos in various places
Diffstat (limited to 'src/libcore/alloc.rs')
-rw-r--r--src/libcore/alloc.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 35e4eea756d..4efcaae59b0 100644
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -518,7 +518,7 @@ pub unsafe trait GlobalAlloc {
     /// The block is described by the given `ptr` pointer and `layout`.
     ///
     /// If this returns a non-null pointer, then ownership of the memory block
-    /// referenced by `ptr` has been transferred to this alloctor.
+    /// referenced by `ptr` has been transferred to this allocator.
     /// The memory may or may not have been deallocated,
     /// and should be considered unusable (unless of course it was
     /// transferred back to the caller again via the return value of