Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
39fd54a4
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,发现更多精彩内容 >>
提交
39fd54a4
编写于
12月 21, 2018
作者:
E
Eduard-Mihai Burtescu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rustc: move the `FORCE_IMPL_FILENAME_LINE` hack into `print_def_path`.
上级
aec5a484
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
42 addition
and
41 deletion
+42
-41
src/librustc/ty/print.rs
src/librustc/ty/print.rs
+42
-41
未找到文件。
src/librustc/ty/print.rs
浏览文件 @
39fd54a4
...
...
@@ -162,8 +162,10 @@ fn print_impl_path(
impl_def_id
:
DefId
,
substs
:
Option
<
SubstsRef
<
'tcx
>>
,
ns
:
Namespace
,
self_ty
:
Ty
<
'tcx
>
,
trait_ref
:
Option
<
ty
::
TraitRef
<
'tcx
>>
,
)
->
Self
::
Path
{
self
.default_print_impl_path
(
impl_def_id
,
substs
,
ns
)
self
.default_print_impl_path
(
impl_def_id
,
substs
,
ns
,
self_ty
,
trait_ref
)
}
#[must_use]
...
...
@@ -273,7 +275,16 @@ pub fn default_print_def_path(
}
DefPathData
::
Impl
=>
{
self
.print_impl_path
(
def_id
,
substs
,
ns
)
let
mut
self_ty
=
self
.tcx
.type_of
(
def_id
);
if
let
Some
(
substs
)
=
substs
{
self_ty
=
self_ty
.subst
(
self
.tcx
,
substs
);
}
let
mut
impl_trait_ref
=
self
.tcx
.impl_trait_ref
(
def_id
);
if
let
Some
(
substs
)
=
substs
{
impl_trait_ref
=
impl_trait_ref
.subst
(
self
.tcx
,
substs
);
}
self
.print_impl_path
(
def_id
,
substs
,
ns
,
self_ty
,
impl_trait_ref
)
}
_
=>
{
...
...
@@ -323,30 +334,24 @@ pub fn default_print_def_path(
fn
default_print_impl_path
(
&
mut
self
,
impl_def_id
:
DefId
,
substs
:
Option
<
SubstsRef
<
'tcx
>>
,
_
substs
:
Option
<
SubstsRef
<
'tcx
>>
,
ns
:
Namespace
,
self_ty
:
Ty
<
'tcx
>
,
impl_trait_ref
:
Option
<
ty
::
TraitRef
<
'tcx
>>
,
)
->
P
::
Path
{
debug!
(
"default_print_impl_path: impl_def_id={:?}
"
,
impl_def_id
);
let
parent_def_id
=
self
.tcx
.parent
(
impl_def_id
)
.unwrap
(
);
debug!
(
"default_print_impl_path: impl_def_id={:?}
, self_ty={}, impl_trait_ref={:?}"
,
impl_def_id
,
self_ty
,
impl_trait_ref
);
// Decide whether to print the parent path for the impl.
// Logically, since impls are global, it's never needed, but
// users may find it useful. Currently, we omit the parent if
// the impl is either in the same module as the self-type or
// as the trait.
let
mut
self_ty
=
self
.tcx
.type_of
(
impl_def_id
);
if
let
Some
(
substs
)
=
substs
{
self_ty
=
self_ty
.subst
(
self
.tcx
,
substs
);
}
let
parent_def_id
=
self
.tcx
.parent
(
impl_def_id
)
.unwrap
();
let
in_self_mod
=
match
characteristic_def_id_of_type
(
self_ty
)
{
None
=>
false
,
Some
(
ty_def_id
)
=>
self
.tcx
.parent
(
ty_def_id
)
==
Some
(
parent_def_id
),
};
let
mut
impl_trait_ref
=
self
.tcx
.impl_trait_ref
(
impl_def_id
);
if
let
Some
(
substs
)
=
substs
{
impl_trait_ref
=
impl_trait_ref
.subst
(
self
.tcx
,
substs
);
}
let
in_trait_mod
=
match
impl_trait_ref
{
None
=>
false
,
Some
(
trait_ref
)
=>
self
.tcx
.parent
(
trait_ref
.def_id
)
==
Some
(
parent_def_id
),
...
...
@@ -702,7 +707,7 @@ fn print_def_path(
ns
:
Namespace
,
projections
:
impl
Iterator
<
Item
=
ty
::
ExistentialProjection
<
'tcx
>>
,
)
->
Self
::
Path
{
// FIXME(eddyb) avoid querying `tcx.generics_of`
// FIXME(eddyb) avoid querying `tcx.generics_of`
and `tcx.def_key`
// both here and in `default_print_def_path`.
let
generics
=
substs
.map
(|
_
|
self
.tcx
.generics_of
(
def_id
));
if
// HACK(eddyb) remove the `FORCE_ABSOLUTE` hack by bypassing `FmtPrinter`
...
...
@@ -720,35 +725,31 @@ fn print_def_path(
}
}
self
.default_print_def_path
(
def_id
,
substs
,
ns
,
projections
)
}
fn
print_impl_path
(
self
:
&
mut
PrintCx
<
'_
,
'_
,
'tcx
,
Self
>
,
impl_def_id
:
DefId
,
substs
:
Option
<
SubstsRef
<
'tcx
>>
,
ns
:
Namespace
,
)
->
Self
::
Path
{
// Always use types for non-local impls, where types are always
// available, and filename/line-number is mostly uninteresting.
let
use_types
=
// HACK(eddyb) remove the `FORCE_ABSOLUTE` hack by bypassing `FmtPrinter`
FORCE_ABSOLUTE
.with
(|
force
|
force
.get
())
||
!
impl_def_id
.is_local
()
||
{
// Otherwise, use filename/line-number if forced.
let
force_no_types
=
FORCE_IMPL_FILENAME_LINE
.with
(|
f
|
f
.get
());
!
force_no_types
};
let
key
=
self
.tcx
.def_key
(
def_id
);
if
let
DefPathData
::
Impl
=
key
.disambiguated_data.data
{
// Always use types for non-local impls, where types are always
// available, and filename/line-number is mostly uninteresting.
let
use_types
=
// HACK(eddyb) remove the `FORCE_ABSOLUTE` hack by bypassing `FmtPrinter`
FORCE_ABSOLUTE
.with
(|
force
|
force
.get
())
||
!
def_id
.is_local
()
||
{
// Otherwise, use filename/line-number if forced.
let
force_no_types
=
FORCE_IMPL_FILENAME_LINE
.with
(|
f
|
f
.get
());
!
force_no_types
};
if
!
use_types
{
// If no type info is available, fall back to
// pretty printing some span information. This should
// only occur very early in the compiler pipeline.
let
parent_def_id
=
self
.tcx
.parent
(
impl_def_id
)
.unwrap
();
let
path
=
self
.print_def_path
(
parent_def_id
,
None
,
ns
,
iter
::
empty
());
let
span
=
self
.tcx
.def_span
(
impl_def_id
);
return
self
.path_append
(
path
,
&
format!
(
"<impl at {:?}>"
,
span
));
if
!
use_types
{
// If no type info is available, fall back to
// pretty printing some span information. This should
// only occur very early in the compiler pipeline.
let
parent_def_id
=
DefId
{
index
:
key
.parent
.unwrap
(),
..
def_id
};
let
path
=
self
.print_def_path
(
parent_def_id
,
None
,
ns
,
iter
::
empty
());
let
span
=
self
.tcx
.def_span
(
def_id
);
return
self
.path_append
(
path
,
&
format!
(
"<impl at {:?}>"
,
span
));
}
}
self
.default_print_
impl_path
(
impl_def_id
,
substs
,
ns
)
self
.default_print_
def_path
(
def_id
,
substs
,
ns
,
projectio
ns
)
}
fn
path_crate
(
self
:
&
mut
PrintCx
<
'_
,
'_
,
'_
,
Self
>
,
cnum
:
CrateNum
)
->
Self
::
Path
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录