---

yaml
---
r: 146834
b: refs/heads/try2
c: 1f7bfac
h: refs/heads/master
v: v3

Author: klutzy

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6ff697d3933754bf9ec5ee5875f487f02a7d087d
+refs/heads/try2: 1f7bfac9d28340b3eda0291dd01b7914c77a88ae
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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));
+            }
+        }
     }
 }
 

branches/try2/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();
         }

branches/try2/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));

branches/try2/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;