---

yaml
---
r: 90047
b: refs/heads/master
c: 1f7bfac
h: refs/heads/master
i:
  90045: da1238b
  90043: 0ab5eef
  90039: b27a2a2
  90031: 3fc4e4c
  90015: 7c1b61a
  89983: fbca3a8
v: v3

Author: klutzy

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6ff697d3933754bf9ec5ee5875f487f02a7d087d
+refs/heads/master: 1f7bfac9d28340b3eda0291dd01b7914c77a88ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/librustc/middle/lint.rs

@@ -803,6 +803,11 @@ fn check_heap_item(cx: &Context, it: &ast::item) {
 // also make error on obsolete attributes for less confusion.
 fn check_item_attribute_usage(cx: &Context, it: &ast::item) {
     let crate_attrs = ["crate_type", "link", "feature", "no_uv", "no_main", "no_std"];
+    let obsolete_attrs = [
+        ("abi", "extern \"abi\" fn"),
+        ("auto_encode", "#[deriving(Encodable)]"),
+        ("auto_decode", "#[deriving(Decodable)]"),
+    ];
 
     for attr in it.attrs.iter() {
         let name = attr.node.value.name();
@@ -816,6 +821,13 @@ fn check_item_attribute_usage(cx: &Context, it: &ast::item) {
                 cx.span_lint(attribute_usage, attr.span, msg);
             }
         }
+
+        for &(obs_attr, obs_alter) in obsolete_attrs.iter() {
+            if name.equiv(&obs_attr) {
+                cx.span_lint(attribute_usage, attr.span,
+                             format!("obsolete attribute: use `{:s}` instead", obs_alter));
+            }
+        }
     }
 }
 

trunk/src/libstd/io/native/process.rs

@@ -365,7 +365,6 @@ fn spawn_process_os(prog: &str, args: &[~str],
     use libc::funcs::bsd44::getdtablesize;
 
     mod rustrt {
-        #[abi = "cdecl"]
         extern {
             pub fn rust_unset_sigprocmask();
         }

trunk/src/libsyntax/ext/auto_encode.rs

@@ -143,7 +143,7 @@ pub enum MacResult {
 }
 
 pub enum SyntaxExtension {
-    // #[auto_encode] and such
+    // #[deriving] and such
     ItemDecorator(ItemDecorator),
 
     // Token-tree expanders
@@ -229,12 +229,6 @@ pub fn syntax_expander_table() -> SyntaxEnv {
     syntax_expanders.insert(intern(&"format_args"),
                             builtin_normal_tt_no_ctxt(
                                 ext::format::expand_args));
-    syntax_expanders.insert(
-        intern(&"auto_encode"),
-        @SE(ItemDecorator(ext::auto_encode::expand_auto_encode)));
-    syntax_expanders.insert(
-        intern(&"auto_decode"),
-        @SE(ItemDecorator(ext::auto_encode::expand_auto_decode)));
     syntax_expanders.insert(intern(&"env"),
                             builtin_normal_tt_no_ctxt(
                                     ext::env::expand_env));

trunk/src/libsyntax/ext/base.rs

@@ -83,7 +83,6 @@ pub mod ext {
     pub mod concat;
     pub mod concat_idents;
     pub mod log_syntax;
-    pub mod auto_encode;
     pub mod source_util;
 
     pub mod trace_macros;