Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f87bc6a5
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,发现更多精彩内容 >>
提交
f87bc6a5
编写于
6月 22, 2014
作者:
E
Edward Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make destructuring trait reference work
Closes #15031.
上级
0ae4b97c
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
68 addition
and
11 deletion
+68
-11
src/librustc/middle/typeck/check/_match.rs
src/librustc/middle/typeck/check/_match.rs
+26
-10
src/test/compile-fail/destructure-trait-ref.rs
src/test/compile-fail/destructure-trait-ref.rs
+41
-0
src/test/compile-fail/issue-4972.rs
src/test/compile-fail/issue-4972.rs
+1
-1
未找到文件。
src/librustc/middle/typeck/check/_match.rs
浏览文件 @
f87bc6a5
...
...
@@ -726,22 +726,38 @@ pub fn check_pat(pcx: &pat_ctxt, pat: &ast::Pat, expected: ty::t) {
}
// Helper function to check gc, box and & patterns
pub
fn
check_pointer_pat
(
pcx
:
&
pat_ctxt
,
fn
check_pointer_pat
(
pcx
:
&
pat_ctxt
,
pointer_kind
:
PointerKind
,
inner
:
&
ast
::
Pat
,
pat_id
:
ast
::
NodeId
,
span
:
Span
,
expected
:
ty
::
t
)
{
let
fcx
=
pcx
.fcx
;
let
tcx
=
fcx
.ccx.tcx
;
let
check_inner
:
|
ty
::
t
|
=
|
e_inner
|
{
match
ty
::
get
(
e_inner
)
.sty
{
ty
::
ty_trait
(
_
)
if
pat_is_binding
(
&
tcx
.def_map
,
inner
)
=>
{
// This is "x = SomeTrait" being reduced from
// "let &x = &SomeTrait" or "let box x = Box<SomeTrait>", an error.
check_pat
(
pcx
,
inner
,
ty
::
mk_err
());
tcx
.sess
.span_err
(
span
,
format!
(
"type `{}` cannot be dereferenced"
,
fcx
.infcx
()
.ty_to_str
(
expected
))
.as_slice
());
fcx
.write_error
(
pat_id
);
}
_
=>
{
check_pat
(
pcx
,
inner
,
e_inner
);
fcx
.write_ty
(
pat_id
,
expected
);
}
}
};
match
*
structure_of
(
fcx
,
span
,
expected
)
{
ty
::
ty_uniq
(
e_inner
)
if
pointer_kind
==
Send
&&
!
ty
::
type_is_trait
(
e_inner
)
=>
{
ty
::
ty_uniq
(
e_inner
)
if
pointer_kind
==
Send
=>
{
check_inner
(
e_inner
);
}
ty
::
ty_rptr
(
_
,
e_inner
)
if
pointer_kind
==
Borrowed
&&
!
ty
::
type_is_trait
(
e_inner
.ty
)
=>
{
ty
::
ty_rptr
(
_
,
e_inner
)
if
pointer_kind
==
Borrowed
=>
{
check_inner
(
e_inner
.ty
);
}
_
=>
{
...
...
src/test/compile-fail/destructure-trait-ref.rs
0 → 100644
浏览文件 @
f87bc6a5
// Copyright 2012-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.
// The regression test for #15031 to make sure destructuring trait
// reference work properly.
trait
T
{}
impl
T
for
int
{}
fn
main
()
{
// For an expression of the form:
//
// let &...&x = &..&SomeTrait;
//
// Say we have n `&` at the left hand and m `&` right hand, then:
// if n < m, we are golden;
// if n == m, it's a derefing non-derefable type error;
// if n > m, it's a type mismatch error.
// n < m
let
&
x
=
&
(
&
1
as
&
T
);
let
&
x
=
&&
(
&
1
as
&
T
);
let
&&
x
=
&&
(
&
1
as
&
T
);
// n == m
let
&
x
=
&
1
as
&
T
;
//~ ERROR cannot be dereferenced
let
&&
x
=
&
(
&
1
as
&
T
);
//~ ERROR cannot be dereferenced
let
box
x
=
box
1
as
Box
<
T
>
;
//~ ERROR cannot be dereferenced
// n > m
let
&&
x
=
&
1
as
&
T
;
//~ ERROR found an `&`-pointer pattern
let
&&&
x
=
&
(
&
1
as
&
T
);
//~ ERROR found an `&`-pointer pattern
let
box
box
x
=
box
1
as
Box
<
T
>
;
//~ ERROR found a box pattern
}
src/test/compile-fail/issue-4972.rs
浏览文件 @
f87bc6a5
...
...
@@ -17,7 +17,7 @@ pub enum TraitWrapper {
fn
get_tw_map
<
'lt
>
(
tw
:
&
'lt
TraitWrapper
)
->
&
'lt
MyTrait
{
match
*
tw
{
A
(
box
ref
map
)
=>
map
,
//~ ERROR
found a box pattern
A
(
box
ref
map
)
=>
map
,
//~ ERROR
cannot be dereferenced
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录