Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
0664b819
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,发现更多精彩内容 >>
提交
0664b819
编写于
4月 05, 2020
作者:
E
Esteban Küber
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use smaller span for suggestion restricting lifetime
上级
6387b091
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
28 deletion
+17
-28
src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
+16
-27
src/test/ui/impl-trait/does-not-live-long-enough.stderr
src/test/ui/impl-trait/does-not-live-long-enough.stderr
+1
-1
未找到文件。
src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
浏览文件 @
0664b819
...
...
@@ -208,45 +208,34 @@ pub(in crate::borrow_check) fn add_explanation_to_diagnostic<'tcx>(
);
};
self
.add_lifetime_bound_suggestion_to_diagnostic
(
tcx
,
err
,
&
category
,
span
,
region_name
,
);
self
.add_lifetime_bound_suggestion_to_diagnostic
(
err
,
&
category
,
span
,
region_name
);
}
_
=>
{}
}
}
pub
(
in
crate
::
borrow_check
)
fn
add_lifetime_bound_suggestion_to_diagnostic
<
'tcx
>
(
pub
(
in
crate
::
borrow_check
)
fn
add_lifetime_bound_suggestion_to_diagnostic
(
&
self
,
tcx
:
TyCtxt
<
'tcx
>
,
err
:
&
mut
DiagnosticBuilder
<
'_
>
,
category
:
&
ConstraintCategory
,
span
:
Span
,
region_name
:
&
RegionName
,
)
{
if
let
ConstraintCategory
::
OpaqueType
=
category
{
if
let
Ok
(
snippet
)
=
tcx
.sess
.source_map
()
.span_to_snippet
(
span
)
{
let
suggestable_name
=
if
region_name
.was_named
()
{
region_name
.to_string
()
}
else
{
"'_"
.to_string
()
};
let
suggestable_name
=
if
region_name
.was_named
()
{
region_name
.to_string
()
}
else
{
"'_"
.to_string
()
};
err
.span_suggestion
(
span
,
&
format!
(
"you can add a bound to the {}to make it last less than
\
`'static` and match `{}`"
,
category
.description
(),
region_name
,
),
format!
(
"{} + {}"
,
snippet
,
suggestable_name
)
,
Applicability
::
Unspecified
,
);
}
let
msg
=
format!
(
"you can add a bound to the {}to make it last less than `'static` and match `{}`"
,
category
.description
(),
region_name
,
);
err
.span_suggestion_verbose
(
span
.shrink_to_hi
(
),
&
msg
,
format!
(
" + {}"
,
suggestable_name
)
,
Applicability
::
Unspecified
,
);
}
}
}
...
...
src/test/ui/impl-trait/does-not-live-long-enough.stderr
浏览文件 @
0664b819
...
...
@@ -14,7 +14,7 @@ LL | }
help: you can add a bound to the opaque type to make it last less than `'static` and match `'a`
|
LL | fn started_with<'a>(&'a self, prefix: &'a str) -> impl Iterator<Item=&'a str> + 'a {
|
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^
|
^^^^
error: aborting due to previous error
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录