mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 16:57:03 +00:00
rollup merge of #23948: nikomatsakis/feature-gate-rust-abi
Like it says. r? @alexcrichton
This commit is contained in:
commit
bb252a8878
|
@ -25,7 +25,7 @@
|
|||
use self::Status::*;
|
||||
use self::AttributeType::*;
|
||||
|
||||
use abi::RustIntrinsic;
|
||||
use abi::Abi;
|
||||
use ast::NodeId;
|
||||
use ast;
|
||||
use attr;
|
||||
|
@ -517,7 +517,7 @@ fn visit_item(&mut self, i: &ast::Item) {
|
|||
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")
|
||||
|
@ -633,11 +633,17 @@ fn visit_fn(&mut self,
|
|||
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);
|
||||
|
|
21
src/test/compile-fail/feature-gate-rust-call.rs
Normal file
21
src/test/compile-fail/feature-gate-rust-call.rs
Normal file
|
@ -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 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, 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() { }
|
|
@ -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() {}
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue