---

yaml
---
r: 93887
b: refs/heads/try
c: 9432e2a
h: refs/heads/master
i:
  93885: 8b4f492
  93883: 6209d06
  93879: 5d74bc3
  93871: 438bda7
  93855: 415f287
  93823: d5e2cd2
v: v3

Author: klutzy

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: b4ad3363f3ce5facdaac7384892319914f119177
+refs/heads/try: 9432e2a25dc5f3a71aa4f95a9dd6ba17198c79bd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/lint.rs

@@ -807,9 +807,12 @@ fn check_attrs_usage(cx: &Context, attrs: &[ast::Attribute]) {
     ];
 
     let obsolete_attrs = [
-        ("abi", "extern \"abi\" fn"),
-        ("auto_encode", "#[deriving(Encodable)]"),
-        ("auto_decode", "#[deriving(Decodable)]"),
+        ("abi", "Use `extern \"abi\" fn` instead"),
+        ("auto_encode", "Use `#[deriving(Encodable)]` instead"),
+        ("auto_decode", "Use `#[deriving(Decodable)]` instead"),
+        ("fast_ffi", "Remove it"),
+        ("fixed_stack_segment", "Remove it"),
+        ("rust_stack", "Remove it"),
     ];
 
     let other_attrs = [
@@ -826,7 +829,7 @@ fn check_attrs_usage(cx: &Context, attrs: &[ast::Attribute]) {
 
         // fn-level
         "test", "bench", "should_fail", "ignore", "inline", "lang", "main", "start",
-        "fixed_stack_segment", "no_split_stack", "rust_stack", "cold",
+        "no_split_stack", "cold",
 
         // internal attribute: bypass privacy inside items
         "!resolve_unexported",
@@ -849,7 +852,7 @@ fn check_attrs_usage(cx: &Context, attrs: &[ast::Attribute]) {
         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));
+                             format!("obsolete attribute: {:s}", obs_alter));
                 return;
             }
         }

branches/try/src/librustpkg/path_util.rs

@@ -461,7 +461,6 @@ pub fn versionize(p: &Path, v: &Version) -> Path {
 }
 
 #[cfg(target_os = "win32")]
-#[fixed_stack_segment]
 pub fn chmod_read_only(p: &Path) -> bool {
     unsafe {
         do p.with_c_str |src_buf| {
@@ -471,7 +470,6 @@ pub fn chmod_read_only(p: &Path) -> bool {
 }
 
 #[cfg(not(target_os = "win32"))]
-#[fixed_stack_segment]
 pub fn chmod_read_only(p: &Path) -> bool {
     unsafe {
         do p.with_c_str |src_buf| {

branches/try/src/test/compile-fail/cast-to-bare-fn.rs

@@ -10,7 +10,6 @@
 
 fn foo(_x: int) { }
 
-#[fixed_stack_segment]
 fn main() {
     let v: u64 = 5;
     let x = foo as extern "C" fn() -> int;

branches/try/src/test/compile-fail/lint-obsolete-attr.rs

@@ -15,4 +15,6 @@
 
 #[abi="stdcall"] extern {} //~ ERROR: obsolete attribute
 
+#[fixed_stack_segment] fn f() {} //~ ERROR: obsolete attribute
+
 fn main() {}