about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2018-09-11 18:07:24 +0200
committerGitHub <noreply@github.com>2018-09-11 18:07:24 +0200
commitc44e88cc8a75fa672ab6bdbfe76ad4323399f254 (patch)
treec4ab860a057b0550340a58526fd5ede10ceb1ba5 /src
parentbc809e01eece1ec55adc781d25e54feac903157a (diff)
parent78f5b6866efb2445b2b7ea306cb9660a94fb58f0 (diff)
downloadrust-c44e88cc8a75fa672ab6bdbfe76ad4323399f254.tar.gz
rust-c44e88cc8a75fa672ab6bdbfe76ad4323399f254.zip
Merge pull request #1 from ubsan/ptr-docs
fix typos
Diffstat (limited to 'src')
-rw-r--r--src/libcore/intrinsics.rs2
-rw-r--r--src/libcore/ptr.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 659b7a23ed9..823678ec880 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -1159,7 +1159,7 @@ extern "rust-intrinsic" {
     /// // At this point, using or dropping `v` results in undefined behavior.
     /// // drop(v); // ERROR
     ///
-    /// // Even leaking `v` "uses" it, and henc eis undefined behavior.
+    /// // Even leaking `v` "uses" it, and hence is undefined behavior.
     /// // mem::forget(v); // ERROR
     ///
     /// unsafe {
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 5c16c8acae5..defe3d807fa 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -47,7 +47,7 @@
 //! ## Alignment
 //!
 //! Valid raw pointers as defined above are not necessarily properly aligned (where
-//! "proper" alignment is defind by the pointee type, i.e., `*const T` must be
+//! "proper" alignment is defined by the pointee type, i.e., `*const T` must be
 //! aligned to `mem::align_of::<T>()`). However, most functions require their
 //! arguments to be properly aligned, and will explicitly state
 //! this requirement in their documentation. Notable exceptions to this are