---

yaml
---
r: 41957
b: refs/heads/master
c: e8f4da7
h: refs/heads/master
i:
  41955: 6bd356e
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4b2aa286d8448168e9077565ff17b7a6df4db105
+refs/heads/master: e8f4da78e78238d7a24dc452302a4c1f113f0e2a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/doc/rust.md

@@ -222,7 +222,7 @@ let log loop
 match mod move mut
 priv pub pure
 ref return
-self static struct super
+self static struct
 true trait type
 unsafe use
 while

trunk/doc/tutorial-ffi.md

@@ -26,11 +26,14 @@ fn as_hex(data: ~[u8]) -> ~str {
     return acc;
 }
 
-fn sha1(data: ~str) -> ~str unsafe {
-    let bytes = str::to_bytes(data);
-    let hash = crypto::SHA1(vec::raw::to_ptr(bytes),
-                            vec::len(bytes) as c_uint, ptr::null());
-    return as_hex(vec::from_buf(hash, 20));
+fn sha1(data: ~str) -> ~str {
+    unsafe {
+        let bytes = str::to_bytes(data);
+        let hash = crypto::SHA1(vec::raw::to_ptr(bytes),
+                                vec::len(bytes) as c_uint,
+                                ptr::null());
+        return as_hex(vec::from_buf(hash, 20));
+    }
 }
 
 fn main() {
@@ -225,13 +228,15 @@ struct timeval {
 extern mod lib_c {
     fn gettimeofday(tv: *timeval, tz: *()) -> i32;
 }
-fn unix_time_in_microseconds() -> u64 unsafe {
-    let x = timeval {
-        mut tv_sec: 0 as c_ulonglong,
-        mut tv_usec: 0 as c_ulonglong
-    };
-    lib_c::gettimeofday(ptr::addr_of(&x), ptr::null());
-    return (x.tv_sec as u64) * 1000_000_u64 + (x.tv_usec as u64);
+fn unix_time_in_microseconds() -> u64 {
+    unsafe {
+        let x = timeval {
+            mut tv_sec: 0 as c_ulonglong,
+            mut tv_usec: 0 as c_ulonglong
+        };
+        lib_c::gettimeofday(ptr::addr_of(&x), ptr::null());
+        return (x.tv_sec as u64) * 1000_000_u64 + (x.tv_usec as u64);
+    }
 }
 
 # fn main() { assert fmt!("%?", unix_time_in_microseconds()) != ~""; }

trunk/src/librustc/middle/ty.rs

@@ -1659,13 +1659,13 @@ fn subst(cx: ctxt,
     }
 }
 
-// Performs substitutions on a set of substitutions (result = sup(sub)) to
+// Performs substitutions on a set of substitutions (result = super(sub)) to
 // yield a new set of substitutions. This is used in trait inheritance.
-fn subst_substs(cx: ctxt, sup: &substs, sub: &substs) -> substs {
+fn subst_substs(cx: ctxt, super: &substs, sub: &substs) -> substs {
     {
-        self_r: sup.self_r,
-        self_ty: sup.self_ty.map(|typ| subst(cx, sub, *typ)),
-        tps: sup.tps.map(|typ| subst(cx, sub, *typ))
+        self_r: super.self_r,
+        self_ty: super.self_ty.map(|typ| subst(cx, sub, *typ)),
+        tps: super.tps.map(|typ| subst(cx, sub, *typ))
     }
 }
 

trunk/src/libsyntax/parse/token.rs

@@ -493,7 +493,7 @@ fn strict_keyword_table() -> HashMap<~str, ()> {
         ~"once",
         ~"priv", ~"pub", ~"pure",
         ~"ref", ~"return",
-        ~"struct", ~"super",
+        ~"struct",
         ~"true", ~"trait", ~"type",
         ~"unsafe", ~"use",
         ~"while"