Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
57aaa9bf
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
57aaa9bf
编写于
1月 05, 2015
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make supertrait references work in object types too.
上级
7ee58632
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
71 addition
and
12 deletion
+71
-12
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+44
-12
src/test/run-pass/associated-type-doubleendediterator-object.rs
...st/run-pass/associated-type-doubleendediterator-object.rs
+27
-0
未找到文件。
src/librustc_typeck/astconv.rs
浏览文件 @
57aaa9bf
...
...
@@ -627,7 +627,8 @@ fn ast_path_to_trait_ref<'a,'tcx>(
}
Some
(
ref
mut
v
)
=>
{
for
binding
in
assoc_bindings
.iter
()
{
match
ast_type_binding_to_projection_predicate
(
this
,
trait_ref
.clone
(),
binding
)
{
match
ast_type_binding_to_projection_predicate
(
this
,
trait_ref
.clone
(),
self_ty
,
binding
)
{
Ok
(
pp
)
=>
{
v
.push
(
pp
);
}
Err
(
ErrorReported
)
=>
{
}
}
...
...
@@ -640,10 +641,13 @@ fn ast_path_to_trait_ref<'a,'tcx>(
fn
ast_type_binding_to_projection_predicate
<
'tcx
>
(
this
:
&
AstConv
<
'tcx
>
,
trait_ref
:
Rc
<
ty
::
TraitRef
<
'tcx
>>
,
mut
trait_ref
:
Rc
<
ty
::
TraitRef
<
'tcx
>>
,
self_ty
:
Option
<
Ty
<
'tcx
>>
,
binding
:
&
ConvertedBinding
<
'tcx
>
)
->
Result
<
ty
::
ProjectionPredicate
<
'tcx
>
,
ErrorReported
>
{
let
tcx
=
this
.tcx
();
// Given something like `U : SomeTrait<T=X>`, we want to produce a
// predicate like `<U as SomeTrait>::T = X`. This is somewhat
// subtle in the event that `T` is defined in a supertrait of
...
...
@@ -671,39 +675,67 @@ fn ast_type_binding_to_projection_predicate<'tcx>(
});
}
// Otherwise, we have to walk through the supertraits to find those that do.
let
mut
candidates
:
Vec
<
_
>
=
traits
::
supertraits
(
this
.tcx
(),
trait_ref
.to_poly_trait_ref
())
// Otherwise, we have to walk through the supertraits to find
// those that do. This is complicated by the fact that, for an
// object type, the `Self` type is not present in the
// substitutions (after all, it's being constructed right now),
// but the `supertraits` iterator really wants one. To handle
// this, we currently insert a dummy type and then remove it
// later. Yuck.
let
dummy_self_ty
=
ty
::
mk_infer
(
tcx
,
ty
::
FreshTy
(
0
));
if
self_ty
.is_none
()
{
// if converting for an object type
let
mut
dummy_substs
=
trait_ref
.substs
.clone
();
assert
!
(
dummy_substs
.self_ty
()
.is_none
());
dummy_substs
.types
.push
(
SelfSpace
,
dummy_self_ty
);
trait_ref
=
Rc
::
new
(
ty
::
TraitRef
::
new
(
trait_ref
.def_id
,
tcx
.mk_substs
(
dummy_substs
)));
}
let
mut
candidates
:
Vec
<
ty
::
PolyTraitRef
>
=
traits
::
supertraits
(
tcx
,
trait_ref
.to_poly_trait_ref
())
.filter
(|
r
|
trait_defines_associated_type_named
(
this
,
r
.def_id
(),
binding
.item_name
))
.collect
();
// If converting for an object type, then remove the dummy-ty from `Self` now.
// Yuckety yuck.
if
self_ty
.is_none
()
{
for
candidate
in
candidates
.iter_mut
()
{
let
mut
dummy_substs
=
candidate
.0
.substs
.clone
();
assert
!
(
dummy_substs
.self_ty
()
==
Some
(
dummy_self_ty
));
dummy_substs
.types
.pop
(
SelfSpace
);
*
candidate
=
ty
::
Binder
(
Rc
::
new
(
ty
::
TraitRef
::
new
(
candidate
.def_id
(),
tcx
.mk_substs
(
dummy_substs
))));
}
}
if
candidates
.len
()
>
1
{
t
his
.tcx
()
.sess
.span_err
(
t
cx
.sess
.span_err
(
binding
.span
,
format!
(
"ambiguous associated type: `{}` defined in multiple supertraits `{}`"
,
token
::
get_name
(
binding
.item_name
),
candidates
.user_string
(
t
his
.tcx
()
))
.as_slice
());
candidates
.user_string
(
t
cx
))
.as_slice
());
return
Err
(
ErrorReported
);
}
let
candidate
=
match
candidates
.pop
()
{
Some
(
c
)
=>
c
,
None
=>
{
t
his
.tcx
()
.sess
.span_err
(
t
cx
.sess
.span_err
(
binding
.span
,
format!
(
"no associated type `{}` defined in `{}`"
,
token
::
get_name
(
binding
.item_name
),
trait_ref
.user_string
(
t
his
.tcx
()
))
.as_slice
());
trait_ref
.user_string
(
t
cx
))
.as_slice
());
return
Err
(
ErrorReported
);
}
};
if
ty
::
binds_late_bound_regions
(
t
his
.tcx
()
,
&
candidate
)
{
t
his
.tcx
()
.sess
.span_err
(
if
ty
::
binds_late_bound_regions
(
t
cx
,
&
candidate
)
{
t
cx
.sess
.span_err
(
binding
.span
,
format!
(
"associated type `{}` defined in higher-ranked supertrait `{}`"
,
token
::
get_name
(
binding
.item_name
),
candidate
.user_string
(
t
his
.tcx
()
))
.as_slice
());
candidate
.user_string
(
t
cx
))
.as_slice
());
return
Err
(
ErrorReported
);
}
...
...
src/test/run-pass/associated-type-doubleendediterator-object.rs
0 → 100644
浏览文件 @
57aaa9bf
// 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.
fn
pairwise_sub
(
mut
t
:
Box
<
DoubleEndedIterator
<
Item
=
int
>>
)
->
int
{
let
mut
result
=
0
;
loop
{
let
front
=
t
.next
();
let
back
=
t
.next_back
();
match
(
front
,
back
)
{
(
Some
(
f
),
Some
(
b
))
=>
{
result
+=
b
-
f
;
}
_
=>
{
return
result
;
}
}
}
}
fn
main
()
{
let
v
=
vec!
(
1
,
2
,
3
,
4
,
5
,
6
);
let
r
=
pairwise_sub
(
box
v
.into_iter
());
assert_eq!
(
r
,
9
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录