about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-22 10:46:32 -0700
committerbors <bors@rust-lang.org>2014-04-22 10:46:32 -0700
commit0966ee5285e9cfd26edf6a1e53bed5eeb8114374 (patch)
tree6108858995e91b3f0e42af98095a8376ca7a021d /src/libstd
parentc03d658f7e39b642cd7305d1319eeb473048111f (diff)
parent0b6a4387230b1f586f86bb996e33e7adf8f70c2a (diff)
downloadrust-0966ee5285e9cfd26edf6a1e53bed5eeb8114374.tar.gz
rust-0966ee5285e9cfd26edf6a1e53bed5eeb8114374.zip
auto merge of #13651 : ryantm/rust/master, r=brson
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/cast.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/cast.rs b/src/libstd/cast.rs
index 0fb6f30e8a1..eb7eb8d1df9 100644
--- a/src/libstd/cast.rs
+++ b/src/libstd/cast.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -28,8 +28,7 @@ pub unsafe fn transmute_copy<T, U>(src: &T) -> U {
  * Move a thing into the void
  *
  * The forget function will take ownership of the provided value but neglect
- * to run any required cleanup or memory-management operations on it. This
- * can be used for various acts of magick.
+ * to run any required cleanup or memory-management operations on it.
  */
 #[inline]
 pub unsafe fn forget<T>(thing: T) { intrinsics::forget(thing); }