Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
152d6238
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
152d6238
编写于
1月 10, 2015
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Feature-gate `<>` syntax used with `Fn`. Fixes #18875.
上级
3975af56
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
5 deletion
+41
-5
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+13
-0
src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs
...ompile-fail/feature-gate-unboxed-closures-manual-impls.rs
+3
-3
src/test/compile-fail/feature-gate-unboxed-closures-method-calls.rs
...ompile-fail/feature-gate-unboxed-closures-method-calls.rs
+1
-1
src/test/compile-fail/feature-gate-unboxed-closures-ufcs-calls.rs
.../compile-fail/feature-gate-unboxed-closures-ufcs-calls.rs
+1
-1
src/test/compile-fail/unboxed-closure-sugar-not-used-on-fn.rs
...test/compile-fail/unboxed-closure-sugar-not-used-on-fn.rs
+23
-0
未找到文件。
src/librustc_typeck/astconv.rs
浏览文件 @
152d6238
...
...
@@ -582,6 +582,19 @@ fn ast_path_to_trait_ref<'a,'tcx>(
let
(
regions
,
types
,
assoc_bindings
)
=
match
path
.segments
.last
()
.unwrap
()
.parameters
{
ast
::
AngleBracketedParameters
(
ref
data
)
=>
{
// For now, require that parenthetical notation be used
// only with `Fn()` etc.
if
!
this
.tcx
()
.sess.features
.borrow
()
.unboxed_closures
&&
this
.tcx
()
.lang_items
.fn_trait_kind
(
trait_def_id
)
.is_some
()
{
this
.tcx
()
.sess
.span_err
(
path
.span
,
"angle-bracket notation is not stable when
\
used with the `Fn` family of traits, use parentheses"
);
span_help!
(
this
.tcx
()
.sess
,
path
.span
,
"add `#![feature(unboxed_closures)]` to
\
the crate attributes to enable"
);
}
convert_angle_bracketed_parameters
(
this
,
&
shifted_rscope
,
data
)
}
ast
::
ParenthesizedParameters
(
ref
data
)
=>
{
...
...
src/test/compile-fail/feature-gate-unboxed-closures-manual-impls.rs
浏览文件 @
152d6238
...
...
@@ -11,15 +11,15 @@
#![allow(dead_code)]
struct
Foo
;
impl
Fn
<
(),
()
>
for
Foo
{
//~ ERROR manual implementations of `Fn` are experimental
impl
Fn
()
for
Foo
{
//~ ERROR manual implementations of `Fn` are experimental
extern
"rust-call"
fn
call
(
&
self
,
args
:
())
->
()
{}
}
struct
Bar
;
impl
FnMut
<
(),
()
>
for
Bar
{
//~ ERROR manual implementations of `FnMut` are experimental
impl
FnMut
()
for
Bar
{
//~ ERROR manual implementations of `FnMut` are experimental
extern
"rust-call"
fn
call_mut
(
&
self
,
args
:
())
->
()
{}
}
struct
Baz
;
impl
FnOnce
<
(),
()
>
for
Baz
{
//~ ERROR manual implementations of `FnOnce` are experimental
impl
FnOnce
()
for
Baz
{
//~ ERROR manual implementations of `FnOnce` are experimental
extern
"rust-call"
fn
call_once
(
&
self
,
args
:
())
->
()
{}
}
...
...
src/test/compile-fail/feature-gate-unboxed-closures-method-calls.rs
浏览文件 @
152d6238
...
...
@@ -10,7 +10,7 @@
#![allow(dead_code)]
fn
foo
<
F
:
Fn
<
(),
()
>
>
(
mut
f
:
F
)
{
fn
foo
<
F
:
Fn
()
>
(
mut
f
:
F
)
{
f
.call
(());
//~ ERROR explicit use of unboxed closure method `call`
f
.call_mut
(());
//~ ERROR explicit use of unboxed closure method `call_mut`
f
.call_once
(());
//~ ERROR explicit use of unboxed closure method `call_once`
...
...
src/test/compile-fail/feature-gate-unboxed-closures-ufcs-calls.rs
浏览文件 @
152d6238
...
...
@@ -10,7 +10,7 @@
#![allow(dead_code)]
fn
foo
<
F
:
Fn
<
(),
()
>
>
(
mut
f
:
F
,
mut
g
:
F
)
{
fn
foo
<
F
:
Fn
()
>
(
mut
f
:
F
,
mut
g
:
F
)
{
Fn
::
call
(
&
g
,
());
//~ ERROR explicit use of unboxed closure method `call`
FnMut
::
call_mut
(
&
mut
g
,
());
//~ ERROR explicit use of unboxed closure method `call_mut`
FnOnce
::
call_once
(
g
,
());
//~ ERROR explicit use of unboxed closure method `call_once`
...
...
src/test/compile-fail/unboxed-closure-sugar-not-used-on-fn.rs
0 → 100644
浏览文件 @
152d6238
// 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.
// Test that the `Fn` traits require `()` form without a feature gate.
fn
bar1
(
x
:
&
Fn
<
(),()
>
)
{
//~^ ERROR angle-bracket notation is not stable when used with the `Fn` family
}
fn
bar2
<
T
>
(
x
:
&
T
)
where
T
:
Fn
<
(),()
>
{
//~^ ERROR angle-bracket notation is not stable when used with the `Fn` family
}
fn
main
()
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录