about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-24 13:50:40 +0000
committerbors <bors@rust-lang.org>2015-04-24 13:50:40 +0000
commitf191f924214aa1dcd342ada1d99775ccbb01ddd7 (patch)
treeaaba16e5f6fd64f9107b81b0c978914313f63b93 /src/libcore
parent9d439b41777103b8b349635e68e9ccd3648aabc2 (diff)
parent1447ee4c2031cfc0950b1bf0f658055e7a86e0c2 (diff)
downloadrust-f191f924214aa1dcd342ada1d99775ccbb01ddd7.tar.gz
rust-f191f924214aa1dcd342ada1d99775ccbb01ddd7.zip
Auto merge of #24758 - Manishearth:rollup, r=Manishearth
- Successful merges: #24523, #24698, #24699, #24700, #24706, #24717, #24718, #24721, #24727
- Failed merges: 
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/raw.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs
index 685b3e5c546..ec84ef7986a 100644
--- a/src/libcore/raw.rs
+++ b/src/libcore/raw.rs
@@ -80,7 +80,7 @@ impl<T> Clone for Slice<T> {
 /// `TraitObject` is guaranteed to match layouts, but it is not the
 /// type of trait objects (e.g. the fields are not directly accessible
 /// on a `&SomeTrait`) nor does it control that layout (changing the
-/// definition will not change the layout of a `&SometTrait`). It is
+/// definition will not change the layout of a `&SomeTrait`). It is
 /// only designed to be used by unsafe code that needs to manipulate
 /// the low-level details.
 ///