From d81e86622ca6864c6510d1cb072fcbfc6be2ea3d Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 1 Apr 2015 15:21:03 -0400 Subject: [PATCH 1/2] Feature gate rust-call ABI. --- src/libsyntax/feature_gate.rs | 12 ++++++++--- .../compile-fail/feature-gate-rust-call.rs | 21 +++++++++++++++++++ ...ture-gate-unboxed-closures-manual-impls.rs | 8 +++---- 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 src/test/compile-fail/feature-gate-rust-call.rs diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index f88381fb36f86..024132e958271 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -25,7 +25,7 @@ use self::Status::*; use self::AttributeType::*; -use abi::RustIntrinsic; +use abi::Abi; use ast::NodeId; use ast; use attr; @@ -511,7 +511,7 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> { across platforms, it is recommended to \ use `#[link(name = \"foo\")]` instead") } - if foreign_module.abi == RustIntrinsic { + if foreign_module.abi == Abi::RustIntrinsic { self.gate_feature("intrinsics", i.span, "intrinsics are subject to change") @@ -627,11 +627,17 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> { span: Span, _node_id: NodeId) { match fn_kind { - visit::FkItemFn(_, _, _, abi) if abi == RustIntrinsic => { + visit::FkItemFn(_, _, _, abi) if abi == Abi::RustIntrinsic => { self.gate_feature("intrinsics", span, "intrinsics are subject to change") } + visit::FkItemFn(_, _, _, abi) | + visit::FkMethod(_, &ast::MethodSig { abi, .. }) if abi == Abi::RustCall => { + self.gate_feature("unboxed_closures", + span, + "rust-call ABI is subject to change") + } _ => {} } visit::walk_fn(self, fn_kind, fn_decl, block, span); diff --git a/src/test/compile-fail/feature-gate-rust-call.rs b/src/test/compile-fail/feature-gate-rust-call.rs new file mode 100644 index 0000000000000..029a9cad65fcf --- /dev/null +++ b/src/test/compile-fail/feature-gate-rust-call.rs @@ -0,0 +1,21 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +extern "rust-call" fn foo() { } //~ ERROR rust-call ABI is subject to change + +trait Foo { + extern "rust-call" fn foo(); +} + +impl Foo for i32 { + extern "rust-call" fn foo() { } //~ ERROR rust-call ABI is subject to change +} + +fn main() { } diff --git a/src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs b/src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs index d86c5d211dc5f..5df309321d310 100644 --- a/src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs +++ b/src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs @@ -17,23 +17,23 @@ struct Foo; impl Fn<()> for Foo { - //~^ ERROR angle-bracket notation is not stable when used with the `Fn` family of traits extern "rust-call" fn call(self, args: ()) -> () {} + //~^ ERROR rust-call ABI is subject to change } struct Foo1; impl FnOnce() for Foo1 { - //~^ ERROR associated type bindings are not allowed here extern "rust-call" fn call_once(self, args: ()) -> () {} + //~^ ERROR rust-call ABI is subject to change } struct Bar; impl FnMut<()> for Bar { - //~^ ERROR angle-bracket notation is not stable when used with the `Fn` family of traits extern "rust-call" fn call_mut(&self, args: ()) -> () {} + //~^ ERROR rust-call ABI is subject to change } struct Baz; impl FnOnce<()> for Baz { - //~^ ERROR angle-bracket notation is not stable when used with the `Fn` family of traits extern "rust-call" fn call_once(&self, args: ()) -> () {} + //~^ ERROR rust-call ABI is subject to change } fn main() {} From 3d8df315408123f2d4a1ecd4663100dca0045a86 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 1 Apr 2015 16:18:56 -0400 Subject: [PATCH 2/2] Path rustdoc test --- src/test/run-make/rustdoc-extern-method/bar.rs | 2 ++ src/test/run-make/rustdoc-extern-method/foo.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/test/run-make/rustdoc-extern-method/bar.rs b/src/test/run-make/rustdoc-extern-method/bar.rs index 672090c13a233..26a05f8490fd1 100644 --- a/src/test/run-make/rustdoc-extern-method/bar.rs +++ b/src/test/run-make/rustdoc-extern-method/bar.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![feature(unboxed_closures)] + extern crate foo; // @has bar/trait.Foo.html //pre "pub trait Foo" diff --git a/src/test/run-make/rustdoc-extern-method/foo.rs b/src/test/run-make/rustdoc-extern-method/foo.rs index fc5f03e8bd36a..96a7a8378b792 100644 --- a/src/test/run-make/rustdoc-extern-method/foo.rs +++ b/src/test/run-make/rustdoc-extern-method/foo.rs @@ -9,6 +9,7 @@ // except according to those terms. #![crate_type="lib"] +#![feature(unboxed_closures)] pub trait Foo { extern "rust-call" fn foo(&self, _: ()) -> i32;