Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
3cce9507
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,发现更多精彩内容 >>
未验证
提交
3cce9507
编写于
1月 07, 2020
作者:
Y
Yuki Okushi
提交者:
GitHub
1月 07, 2020
浏览文件
操作
浏览文件
下载
差异文件
Rollup merge of #67671 - estebank:type-impl-trait, r=davidtwco
Account for `type X = impl Trait;` in lifetime suggestion Fix #67619.
上级
c671fc1c
2905f14b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
4 deletion
+9
-4
src/librustc_mir/borrow_check/diagnostics/region_errors.rs
src/librustc_mir/borrow_check/diagnostics/region_errors.rs
+8
-3
src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
...st/ui/impl-trait/multiple-lifetimes/error-handling.stderr
+1
-1
未找到文件。
src/librustc_mir/borrow_check/diagnostics/region_errors.rs
浏览文件 @
3cce9507
...
...
@@ -800,7 +800,7 @@ fn add_static_impl_trait_suggestion(
// If there is a static predicate, then the only sensible suggestion is to replace
// fr with `'static`.
if
has_static_predicate
{
diag
.help
(
&
format!
(
"consider replacing `{}` with `{}`"
,
fr_name
,
static_str
,
));
diag
.help
(
&
format!
(
"consider replacing `{}` with `{}`"
,
fr_name
,
static_str
));
}
else
{
// Otherwise, we should suggest adding a constraint on the return type.
let
span
=
infcx
.tcx
.def_span
(
*
did
);
...
...
@@ -810,7 +810,12 @@ fn add_static_impl_trait_suggestion(
}
else
{
"'_"
.to_string
()
};
let
suggestion
=
if
snippet
.ends_with
(
";"
)
{
// `type X = impl Trait;`
format!
(
"{} + {};"
,
&
snippet
[
..
snippet
.len
()
-
1
],
suggestable_fr_name
)
}
else
{
format!
(
"{} + {}"
,
snippet
,
suggestable_fr_name
)
};
diag
.span_suggestion
(
span
,
&
format!
(
...
...
@@ -818,7 +823,7 @@ fn add_static_impl_trait_suggestion(
`{}`, add `{}` as a bound"
,
fr_name
,
suggestable_fr_name
,
),
format!
(
"{} + {}"
,
snippet
,
suggestable_fr_name
)
,
suggestion
,
Applicability
::
MachineApplicable
,
);
}
...
...
src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
浏览文件 @
3cce9507
...
...
@@ -7,7 +7,7 @@ LL | fn foo<'a, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
= help: consider replacing `'a` with `'static`
help: to allow this `impl Trait` to capture borrowed data with lifetime `'a`, add `'a` as a bound
|
LL | type E<'a, 'b> = impl Sized
; + 'a
LL | type E<'a, 'b> = impl Sized
+ 'a;
|
error: aborting due to previous error
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录