---

yaml
---
r: 41956
b: refs/heads/master
c: 4b2aa28
h: refs/heads/master
v: v3

Author: sonwow

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 718a0fcdc1d6a338cddc9aba76a2ae1ddb4e9486
+refs/heads/master: 4b2aa286d8448168e9077565ff17b7a6df4db105
 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
+self static struct super
 true trait type
 unsafe use
 while

trunk/src/librustc/middle/resolve.rs

@@ -10,7 +10,6 @@
 
 use core::prelude::*;
 
-use driver::session;
 use driver::session::Session;
 use metadata::csearch::{each_path, get_method_names_if_trait};
 use metadata::csearch::{get_static_methods_if_impl, get_type_name_if_impl};
@@ -3932,10 +3931,7 @@ impl Resolver {
             item_fn(ref fn_decl, _, ref ty_params, ref block) => {
                 // If this is the main function, we must record it in the
                 // session.
-                // FIXME #4404 android JNI hacks
-                if !self.session.building_library ||
-                    self.session.targ_cfg.os == session::os_android {
-
+                if !self.session.building_library {
                     if self.attr_main_fn.is_none() &&
                            item.ident == special_idents::main {
 

trunk/src/librustc/middle/ty.rs

@@ -1659,13 +1659,13 @@ fn subst(cx: ctxt,
     }
 }
 
-// Performs substitutions on a set of substitutions (result = super(sub)) to
+// Performs substitutions on a set of substitutions (result = sup(sub)) to
 // yield a new set of substitutions. This is used in trait inheritance.
-fn subst_substs(cx: ctxt, super: &substs, sub: &substs) -> substs {
+fn subst_substs(cx: ctxt, sup: &substs, sub: &substs) -> substs {
     {
-        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))
+        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))
     }
 }
 

trunk/src/libsyntax/parse/token.rs

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

trunk/src/test/compile-fail/keyword-super.rs

@@ -0,0 +1,3 @@
+fn main() {
+    let super: int; //~ ERROR found `super` in ident position
+}