Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
9a196aa1
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,发现更多精彩内容 >>
提交
9a196aa1
编写于
7月 26, 2015
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #27283 - arielb1:free-self-2, r=eddyb
Fixes #27281 r?
@EddyB
上级
7276d8b7
11aa8756
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
63 addition
and
44 deletion
+63
-44
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+25
-32
src/librustc_typeck/collect.rs
src/librustc_typeck/collect.rs
+12
-12
src/test/run-pass/issue-27281.rs
src/test/run-pass/issue-27281.rs
+26
-0
未找到文件。
src/librustc_typeck/astconv.rs
浏览文件 @
9a196aa1
...
...
@@ -60,7 +60,7 @@
use
middle
::
ty
::{
self
,
RegionEscape
,
Ty
,
ToPredicate
,
HasTypeFlags
};
use
middle
::
ty_fold
;
use
require_c_abi_if_variadic
;
use
rscope
::{
self
,
UnelidableRscope
,
RegionScope
,
ElidableRscope
,
ExplicitRscope
,
use
rscope
::{
self
,
UnelidableRscope
,
RegionScope
,
ElidableRscope
,
ObjectLifetimeDefaultRscope
,
ShiftedRscope
,
BindingRscope
,
ElisionFailureInfo
,
ElidedLifetime
};
use
util
::
common
::{
ErrorReported
,
FN_OUTPUT_NAME
};
...
...
@@ -1208,40 +1208,33 @@ fn associated_path_def_to_ty<'tcx>(this: &AstConv<'tcx>,
(
_
,
def
::
DefSelfTy
(
Some
(
trait_did
),
Some
((
impl_id
,
_
))))
=>
{
// `Self` in an impl of a trait - we have a concrete self type and a
// trait reference.
match
tcx
.map
.expect_item
(
impl_id
)
.node
{
ast
::
ItemImpl
(
_
,
_
,
_
,
Some
(
ref
trait_ref
),
_
,
_
)
=>
{
if
this
.ensure_super_predicates
(
span
,
trait_did
)
.is_err
()
{
return
(
tcx
.types.err
,
ty_path_def
);
}
let
trait_ref
=
tcx
.impl_trait_ref
(
ast_util
::
local_def
(
impl_id
))
.unwrap
();
let
trait_ref
=
if
let
Some
(
free_substs
)
=
this
.get_free_substs
()
{
trait_ref
.subst
(
tcx
,
free_substs
)
}
else
{
trait_ref
};
let
trait_segment
=
&
trait_ref
.path.segments
.last
()
.unwrap
();
let
trait_ref
=
ast_path_to_mono_trait_ref
(
this
,
&
ExplicitRscope
,
span
,
PathParamMode
::
Explicit
,
trait_did
,
Some
(
ty
),
trait_segment
);
let
candidates
:
Vec
<
ty
::
PolyTraitRef
>
=
traits
::
supertraits
(
tcx
,
ty
::
Binder
(
trait_ref
.clone
()))
.filter
(|
r
|
this
.trait_defines_associated_type_named
(
r
.def_id
(),
assoc_name
))
.collect
();
match
one_bound_for_assoc_type
(
tcx
,
candidates
,
"Self"
,
&
token
::
get_name
(
assoc_name
),
span
)
{
Ok
(
bound
)
=>
bound
,
Err
(
ErrorReported
)
=>
return
(
tcx
.types.err
,
ty_path_def
),
}
}
_
=>
unreachable!
()
if
this
.ensure_super_predicates
(
span
,
trait_did
)
.is_err
()
{
return
(
tcx
.types.err
,
ty_path_def
);
}
let
candidates
:
Vec
<
ty
::
PolyTraitRef
>
=
traits
::
supertraits
(
tcx
,
ty
::
Binder
(
trait_ref
))
.filter
(|
r
|
this
.trait_defines_associated_type_named
(
r
.def_id
(),
assoc_name
))
.collect
();
match
one_bound_for_assoc_type
(
tcx
,
candidates
,
"Self"
,
&
token
::
get_name
(
assoc_name
),
span
)
{
Ok
(
bound
)
=>
bound
,
Err
(
ErrorReported
)
=>
return
(
tcx
.types.err
,
ty_path_def
),
}
}
(
&
ty
::
TyParam
(
_
),
def
::
DefSelfTy
(
Some
(
trait_did
),
None
))
=>
{
(
&
ty
::
TyParam
(
_
),
def
::
DefSelfTy
(
Some
(
trait_did
),
None
))
=>
{
assert_eq!
(
trait_did
.krate
,
ast
::
LOCAL_CRATE
);
match
find_bound_for_assoc_item
(
this
,
trait_did
.node
,
...
...
src/librustc_typeck/collect.rs
浏览文件 @
9a196aa1
...
...
@@ -836,6 +836,18 @@ fn convert_item(ccx: &CrateCtxt, it: &ast::Item) {
ty
:
selfty
});
tcx
.predicates
.borrow_mut
()
.insert
(
local_def
(
it
.id
),
ty_predicates
.clone
());
if
let
&
Some
(
ref
ast_trait_ref
)
=
opt_trait_ref
{
tcx
.impl_trait_refs
.borrow_mut
()
.insert
(
local_def
(
it
.id
),
Some
(
astconv
::
instantiate_mono_trait_ref
(
&
ccx
.icx
(
&
ty_predicates
),
&
ExplicitRscope
,
ast_trait_ref
,
Some
(
selfty
)))
);
}
else
{
tcx
.impl_trait_refs
.borrow_mut
()
.insert
(
local_def
(
it
.id
),
None
);
}
// If there is a trait reference, treat the methods as always public.
// This is to work around some incorrect behavior in privacy checking:
...
...
@@ -935,18 +947,6 @@ fn convert_item(ccx: &CrateCtxt, it: &ast::Item) {
}
}
if
let
&
Some
(
ref
ast_trait_ref
)
=
opt_trait_ref
{
tcx
.impl_trait_refs
.borrow_mut
()
.insert
(
local_def
(
it
.id
),
Some
(
astconv
::
instantiate_mono_trait_ref
(
&
ccx
.icx
(
&
ty_predicates
),
&
ExplicitRscope
,
ast_trait_ref
,
Some
(
selfty
)))
);
}
else
{
tcx
.impl_trait_refs
.borrow_mut
()
.insert
(
local_def
(
it
.id
),
None
);
}
enforce_impl_params_are_constrained
(
tcx
,
generics
,
local_def
(
it
.id
),
...
...
src/test/run-pass/issue-27281.rs
0 → 100644
浏览文件 @
9a196aa1
// Copyright 2015 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.
pub
trait
Trait
<
'a
>
{
type
T
;
type
U
;
fn
foo
(
&
self
,
s
:
&
'a
())
->
&
'a
();
}
impl
<
'a
>
Trait
<
'a
>
for
()
{
type
T
=
&
'a
();
type
U
=
Self
::
T
;
fn
foo
(
&
self
,
s
:
&
'a
())
->
&
'a
()
{
let
t
:
Self
::
T
=
s
;
t
}
}
fn
main
()
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录