Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
73558160
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,发现更多精彩内容 >>
提交
73558160
编写于
6月 08, 2020
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
Auto merge of #73046 - marmeladema:save-analysis-fix-path, r=Xanewok
save_analysis: fix some ICEs Fixes #73020 Fixes #73022 Fixes #73041
上级
6aa1d93c
a7c18e02
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
39 addition
and
6 deletion
+39
-6
src/librustc_save_analysis/dump_visitor.rs
src/librustc_save_analysis/dump_visitor.rs
+5
-3
src/librustc_save_analysis/lib.rs
src/librustc_save_analysis/lib.rs
+7
-3
src/test/ui/save-analysis/issue-73020.rs
src/test/ui/save-analysis/issue-73020.rs
+5
-0
src/test/ui/save-analysis/issue-73020.stderr
src/test/ui/save-analysis/issue-73020.stderr
+9
-0
src/test/ui/save-analysis/issue-73022.rs
src/test/ui/save-analysis/issue-73022.rs
+13
-0
未找到文件。
src/librustc_save_analysis/dump_visitor.rs
浏览文件 @
73558160
...
...
@@ -210,9 +210,11 @@ fn write_sub_paths(&mut self, path: &'tcx hir::Path<'tcx>) {
// As write_sub_paths, but does not process the last ident in the path (assuming it
// will be processed elsewhere). See note on write_sub_paths about global.
fn
write_sub_paths_truncated
(
&
mut
self
,
path
:
&
'tcx
hir
::
Path
<
'tcx
>
)
{
for
seg
in
&
path
.segments
[
..
path
.segments
.len
()
-
1
]
{
if
let
Some
(
data
)
=
self
.save_ctxt
.get_path_segment_data
(
seg
)
{
self
.dumper
.dump_ref
(
data
);
if
let
[
segments
@
..
,
_
]
=
path
.segments
{
for
seg
in
segments
{
if
let
Some
(
data
)
=
self
.save_ctxt
.get_path_segment_data
(
seg
)
{
self
.dumper
.dump_ref
(
data
);
}
}
}
}
...
...
src/librustc_save_analysis/lib.rs
浏览文件 @
73558160
...
...
@@ -534,10 +534,14 @@ pub fn get_expr_data(&self, expr: &hir::Expr<'_>) -> Option<Data> {
}
}
}
hir
::
ExprKind
::
Struct
(
hir
::
QPath
::
Resolved
(
_
,
path
),
..
)
=>
{
hir
::
ExprKind
::
Struct
(
qpath
,
..
)
=>
{
let
segment
=
match
qpath
{
hir
::
QPath
::
Resolved
(
_
,
path
)
=>
path
.segments
.last
()
.unwrap
(),
hir
::
QPath
::
TypeRelative
(
_
,
segment
)
=>
segment
,
};
match
self
.tables
.expr_ty_adjusted
(
&
hir_node
)
.kind
{
ty
::
Adt
(
def
,
_
)
if
!
def
.is_enum
()
=>
{
let
sub_span
=
path
.segments
.last
()
.unwrap
()
.ident.span
;
let
sub_span
=
segment
.ident.span
;
filter!
(
self
.span_utils
,
sub_span
);
let
span
=
self
.span_from_span
(
sub_span
);
Some
(
Data
::
RefData
(
Ref
{
...
...
@@ -580,7 +584,7 @@ pub fn get_expr_data(&self, expr: &hir::Expr<'_>) -> Option<Data> {
}
_
=>
{
// FIXME
bug!
();
bug!
(
"invalid expression: {:?}"
,
expr
);
}
}
}
...
...
src/test/ui/save-analysis/issue-73020.rs
0 → 100644
浏览文件 @
73558160
// compile-flags: -Zsave-analysis
use
{
self
};
//~ ERROR E0431
fn
main
()
{
}
src/test/ui/save-analysis/issue-73020.stderr
0 → 100644
浏览文件 @
73558160
error[E0431]: `self` import can only appear in an import list with a non-empty prefix
--> $DIR/issue-73020.rs:2:6
|
LL | use {self};
| ^^^^ can only appear in an import list with a non-empty prefix
error: aborting due to previous error
For more information about this error, try `rustc --explain E0431`.
src/test/ui/save-analysis/issue-73022.rs
0 → 100644
浏览文件 @
73558160
// build-pass
// compile-flags: -Zsave-analysis
enum
Enum2
{
Variant8
{
_
field
:
bool
},
}
impl
Enum2
{
fn
new_variant8
()
->
Enum2
{
Self
::
Variant8
{
_
field
:
true
}
}
}
fn
main
()
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录