Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
aed7c30e
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,发现更多精彩内容 >>
提交
aed7c30e
编写于
4月 01, 2020
作者:
T
Tyler Mandry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use clearer message when obligation is caused by await expr
上级
6edfd66c
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
126 addition
and
46 deletion
+126
-46
src/librustc_ast_lowering/expr.rs
src/librustc_ast_lowering/expr.rs
+2
-2
src/librustc_hir/hir.rs
src/librustc_hir/hir.rs
+12
-3
src/librustc_trait_selection/traits/error_reporting/suggestions.rs
...stc_trait_selection/traits/error_reporting/suggestions.rs
+108
-34
src/librustc_typeck/check/expr.rs
src/librustc_typeck/check/expr.rs
+1
-1
src/test/ui/async-await/issue-68112.stderr
src/test/ui/async-await/issue-68112.stderr
+3
-6
未找到文件。
src/librustc_ast_lowering/expr.rs
浏览文件 @
aed7c30e
...
@@ -590,6 +590,7 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
...
@@ -590,6 +590,7 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
await_span
,
await_span
,
self
.allow_gen_future
.clone
(),
self
.allow_gen_future
.clone
(),
);
);
let
expr
=
self
.lower_expr
(
expr
);
let
pinned_ident
=
Ident
::
with_dummy_span
(
sym
::
pinned
);
let
pinned_ident
=
Ident
::
with_dummy_span
(
sym
::
pinned
);
let
(
pinned_pat
,
pinned_pat_hid
)
=
let
(
pinned_pat
,
pinned_pat_hid
)
=
...
@@ -671,7 +672,7 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
...
@@ -671,7 +672,7 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
let
unit
=
self
.expr_unit
(
span
);
let
unit
=
self
.expr_unit
(
span
);
let
yield_expr
=
self
.expr
(
let
yield_expr
=
self
.expr
(
span
,
span
,
hir
::
ExprKind
::
Yield
(
unit
,
hir
::
YieldSource
::
Await
),
hir
::
ExprKind
::
Yield
(
unit
,
hir
::
YieldSource
::
Await
{
expr
:
Some
(
expr
.hir_id
)
}
),
ThinVec
::
new
(),
ThinVec
::
new
(),
);
);
let
yield_expr
=
self
.arena
.alloc
(
yield_expr
);
let
yield_expr
=
self
.arena
.alloc
(
yield_expr
);
...
@@ -704,7 +705,6 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
...
@@ -704,7 +705,6 @@ fn lower_expr_await(&mut self, await_span: Span, expr: &Expr) -> hir::ExprKind<'
// match <expr> {
// match <expr> {
// mut pinned => loop { .. }
// mut pinned => loop { .. }
// }
// }
let
expr
=
self
.lower_expr
(
expr
);
hir
::
ExprKind
::
Match
(
expr
,
arena_vec!
[
self
;
pinned_arm
],
hir
::
MatchSource
::
AwaitDesugar
)
hir
::
ExprKind
::
Match
(
expr
,
arena_vec!
[
self
;
pinned_arm
],
hir
::
MatchSource
::
AwaitDesugar
)
}
}
...
...
src/librustc_hir/hir.rs
浏览文件 @
aed7c30e
...
@@ -1736,15 +1736,24 @@ pub struct Destination {
...
@@ -1736,15 +1736,24 @@ pub struct Destination {
#[derive(Copy,
Clone,
PartialEq,
Eq,
Debug,
RustcEncodable,
RustcDecodable,
HashStable_Generic)]
#[derive(Copy,
Clone,
PartialEq,
Eq,
Debug,
RustcEncodable,
RustcDecodable,
HashStable_Generic)]
pub
enum
YieldSource
{
pub
enum
YieldSource
{
/// An `<expr>.await`.
/// An `<expr>.await`.
Await
,
Await
{
expr
:
Option
<
HirId
>
}
,
/// A plain `yield`.
/// A plain `yield`.
Yield
,
Yield
,
}
}
impl
YieldSource
{
pub
fn
is_await
(
&
self
)
->
bool
{
match
self
{
YieldSource
::
Await
{
..
}
=>
true
,
YieldSource
::
Yield
=>
false
,
}
}
}
impl
fmt
::
Display
for
YieldSource
{
impl
fmt
::
Display
for
YieldSource
{
fn
fmt
(
&
self
,
f
:
&
mut
fmt
::
Formatter
<
'_
>
)
->
fmt
::
Result
{
fn
fmt
(
&
self
,
f
:
&
mut
fmt
::
Formatter
<
'_
>
)
->
fmt
::
Result
{
f
.write_str
(
match
self
{
f
.write_str
(
match
self
{
YieldSource
::
Await
=>
"`await`"
,
YieldSource
::
Await
{
..
}
=>
"`await`"
,
YieldSource
::
Yield
=>
"`yield`"
,
YieldSource
::
Yield
=>
"`yield`"
,
})
})
}
}
...
@@ -1755,7 +1764,7 @@ fn from(kind: GeneratorKind) -> Self {
...
@@ -1755,7 +1764,7 @@ fn from(kind: GeneratorKind) -> Self {
match
kind
{
match
kind
{
// Guess based on the kind of the current generator.
// Guess based on the kind of the current generator.
GeneratorKind
::
Gen
=>
Self
::
Yield
,
GeneratorKind
::
Gen
=>
Self
::
Yield
,
GeneratorKind
::
Async
(
_
)
=>
Self
::
Await
,
GeneratorKind
::
Async
(
_
)
=>
Self
::
Await
{
expr
:
None
}
,
}
}
}
}
}
}
...
...
src/librustc_trait_selection/traits/error_reporting/suggestions.rs
浏览文件 @
aed7c30e
...
@@ -127,13 +127,14 @@ fn note_obligation_cause_for_async_await(
...
@@ -127,13 +127,14 @@ fn note_obligation_cause_for_async_await(
scope_span
:
&
Option
<
Span
>
,
scope_span
:
&
Option
<
Span
>
,
expr
:
Option
<
hir
::
HirId
>
,
expr
:
Option
<
hir
::
HirId
>
,
snippet
:
String
,
snippet
:
String
,
inner_generator
:
DefId
,
inner_generator
_body
:
Option
<&
hir
::
Body
<
'_
>>
,
outer_generator
:
Option
<
DefId
>
,
outer_generator
:
Option
<
DefId
>
,
trait_ref
:
ty
::
TraitRef
<
'_
>
,
trait_ref
:
ty
::
TraitRef
<
'_
>
,
target_ty
:
Ty
<
'tcx
>
,
target_ty
:
Ty
<
'tcx
>
,
tables
:
&
ty
::
TypeckTables
<
'_
>
,
tables
:
&
ty
::
TypeckTables
<
'_
>
,
obligation
:
&
PredicateObligation
<
'tcx
>
,
obligation
:
&
PredicateObligation
<
'tcx
>
,
next_code
:
Option
<&
ObligationCauseCode
<
'tcx
>>
,
next_code
:
Option
<&
ObligationCauseCode
<
'tcx
>>
,
from_awaited_ty
:
Option
<
Span
>
,
);
);
fn
note_obligation_cause_code
<
T
>
(
fn
note_obligation_cause_code
<
T
>
(
...
@@ -1203,6 +1204,17 @@ fn maybe_note_obligation_cause_for_async_await(
...
@@ -1203,6 +1204,17 @@ fn maybe_note_obligation_cause_for_async_await(
}
}
};
};
let
generator_body
=
self
.tcx
.hir
()
.as_local_hir_id
(
generator_did
)
.and_then
(|
hir_id
|
self
.tcx
.hir
()
.maybe_body_owned_by
(
hir_id
))
.map
(|
body_id
|
self
.tcx
.hir
()
.body
(
body_id
));
let
mut
visitor
=
AwaitsVisitor
::
default
();
if
let
Some
(
body
)
=
generator_body
{
visitor
.visit_body
(
body
);
}
debug!
(
"maybe_note_obligation_cause_for_async_await: awaits = {:?}"
,
visitor
.awaits
);
// Look for a type inside the generator interior that matches the target type to get
// Look for a type inside the generator interior that matches the target type to get
// a span.
// a span.
let
target_ty_erased
=
self
.tcx
.erase_regions
(
&
target_ty
);
let
target_ty_erased
=
self
.tcx
.erase_regions
(
&
target_ty
);
...
@@ -1232,8 +1244,26 @@ fn maybe_note_obligation_cause_for_async_await(
...
@@ -1232,8 +1244,26 @@ fn maybe_note_obligation_cause_for_async_await(
);
);
eq
eq
})
})
.map
(|
ty
::
GeneratorInteriorTypeCause
{
span
,
scope_span
,
expr
,
..
}|
{
.map
(|
cause
|
{
(
span
,
source_map
.span_to_snippet
(
*
span
),
scope_span
,
expr
)
// Check to see if any awaited expressions have the target type.
let
from_awaited_ty
=
visitor
.awaits
.into_iter
()
.map
(|
id
|
self
.tcx
.hir
()
.expect_expr
(
id
))
.find
(|
expr
|
{
let
ty
=
tables
.expr_ty_adjusted
(
&
expr
);
// Compare types using the same logic as above.
let
ty_erased
=
self
.tcx
.erase_late_bound_regions
(
&
ty
::
Binder
::
bind
(
ty
));
let
ty_erased
=
self
.tcx
.erase_regions
(
&
ty_erased
);
let
eq
=
ty
::
TyS
::
same_type
(
ty_erased
,
target_ty_erased
);
debug!
(
"maybe_note_obligation_cause_for_async_await: await_expr={:?}
\
await_ty_erased={:?} target_ty_erased={:?} eq={:?}"
,
expr
,
ty_erased
,
target_ty_erased
,
eq
);
eq
})
.map
(|
expr
|
expr
.span
);
let
ty
::
GeneratorInteriorTypeCause
{
span
,
scope_span
,
expr
,
..
}
=
cause
;
(
span
,
source_map
.span_to_snippet
(
*
span
),
scope_span
,
expr
,
from_awaited_ty
)
});
});
debug!
(
debug!
(
...
@@ -1241,20 +1271,21 @@ fn maybe_note_obligation_cause_for_async_await(
...
@@ -1241,20 +1271,21 @@ fn maybe_note_obligation_cause_for_async_await(
generator_interior_types={:?} target_span={:?}"
,
generator_interior_types={:?} target_span={:?}"
,
target_ty
,
tables
.generator_interior_types
,
target_span
target_ty
,
tables
.generator_interior_types
,
target_span
);
);
if
let
Some
((
target_span
,
Ok
(
snippet
),
scope_span
,
expr
))
=
target_span
{
if
let
Some
((
target_span
,
Ok
(
snippet
),
scope_span
,
expr
,
from_awaited_ty
))
=
target_span
{
self
.note_obligation_cause_for_async_await
(
self
.note_obligation_cause_for_async_await
(
err
,
err
,
*
target_span
,
*
target_span
,
scope_span
,
scope_span
,
*
expr
,
*
expr
,
snippet
,
snippet
,
generator_
did
,
generator_
body
,
outer_generator
,
outer_generator
,
trait_ref
,
trait_ref
,
target_ty
,
target_ty
,
tables
,
tables
,
obligation
,
obligation
,
next_code
,
next_code
,
from_awaited_ty
,
);
);
true
true
}
else
{
}
else
{
...
@@ -1271,22 +1302,18 @@ fn note_obligation_cause_for_async_await(
...
@@ -1271,22 +1302,18 @@ fn note_obligation_cause_for_async_await(
scope_span
:
&
Option
<
Span
>
,
scope_span
:
&
Option
<
Span
>
,
expr
:
Option
<
hir
::
HirId
>
,
expr
:
Option
<
hir
::
HirId
>
,
snippet
:
String
,
snippet
:
String
,
inner_generator
:
DefId
,
inner_generator
_body
:
Option
<&
hir
::
Body
<
'_
>>
,
outer_generator
:
Option
<
DefId
>
,
outer_generator
:
Option
<
DefId
>
,
trait_ref
:
ty
::
TraitRef
<
'_
>
,
trait_ref
:
ty
::
TraitRef
<
'_
>
,
target_ty
:
Ty
<
'tcx
>
,
target_ty
:
Ty
<
'tcx
>
,
tables
:
&
ty
::
TypeckTables
<
'_
>
,
tables
:
&
ty
::
TypeckTables
<
'_
>
,
obligation
:
&
PredicateObligation
<
'tcx
>
,
obligation
:
&
PredicateObligation
<
'tcx
>
,
next_code
:
Option
<&
ObligationCauseCode
<
'tcx
>>
,
next_code
:
Option
<&
ObligationCauseCode
<
'tcx
>>
,
from_awaited_ty
:
Option
<
Span
>
,
)
{
)
{
let
source_map
=
self
.tcx.sess
.source_map
();
let
source_map
=
self
.tcx.sess
.source_map
();
let
is_async
=
self
let
is_async
=
inner_generator_body
.tcx
.hir
()
.as_local_hir_id
(
inner_generator
)
.and_then
(|
hir_id
|
self
.tcx
.hir
()
.maybe_body_owned_by
(
hir_id
))
.map
(|
body_id
|
self
.tcx
.hir
()
.body
(
body_id
))
.and_then
(|
body
|
body
.generator_kind
())
.and_then
(|
body
|
body
.generator_kind
())
.map
(|
generator_kind
|
match
generator_kind
{
.map
(|
generator_kind
|
match
generator_kind
{
hir
::
GeneratorKind
::
Async
(
..
)
=>
true
,
hir
::
GeneratorKind
::
Async
(
..
)
=>
true
,
...
@@ -1345,7 +1372,35 @@ fn note_obligation_cause_for_async_await(
...
@@ -1345,7 +1372,35 @@ fn note_obligation_cause_for_async_await(
)
)
};
};
let
push_target_span
=
|
span
:
&
mut
MultiSpan
|
{
if
target_ty
.is_impl_trait
()
{
// It's not very useful to tell the user the type if it's opaque.
span
.push_span_label
(
target_span
,
"created here"
.to_string
());
}
else
{
span
.push_span_label
(
target_span
,
format!
(
"has type `{}`"
,
target_ty
));
}
};
if
let
Some
(
await_span
)
=
from_awaited_ty
{
// The type causing this obligation is one being awaited at await_span.
let
mut
span
=
MultiSpan
::
from_span
(
await_span
);
span
.push_span_label
(
await_span
,
"await occurs here"
.to_string
(),
);
push_target_span
(
&
mut
span
);
err
.span_note
(
span
,
&
format!
(
"{} as this value is used in an await"
,
trait_explanation
),
);
}
else
{
// Look at the last interior type to get a span for the `.await`.
// Look at the last interior type to get a span for the `.await`.
debug!
(
"note_obligation_cause_for_async_await generator_interior_types: {:#?}"
,
tables
.generator_interior_types
);
let
await_span
=
tables
.generator_interior_types
.iter
()
.map
(|
t
|
t
.span
)
.last
()
.unwrap
();
let
await_span
=
tables
.generator_interior_types
.iter
()
.map
(|
t
|
t
.span
)
.last
()
.unwrap
();
let
mut
span
=
MultiSpan
::
from_span
(
await_span
);
let
mut
span
=
MultiSpan
::
from_span
(
await_span
);
span
.push_span_label
(
span
.push_span_label
(
...
@@ -1353,12 +1408,7 @@ fn note_obligation_cause_for_async_await(
...
@@ -1353,12 +1408,7 @@ fn note_obligation_cause_for_async_await(
format!
(
"{} occurs here, with `{}` maybe used later"
,
await_or_yield
,
snippet
),
format!
(
"{} occurs here, with `{}` maybe used later"
,
await_or_yield
,
snippet
),
);
);
if
target_ty
.is_impl_trait
()
{
push_target_span
(
&
mut
span
);
// It's not very useful to tell the user the type if it's opaque.
span
.push_span_label
(
target_span
,
"created here"
.to_string
());
}
else
{
span
.push_span_label
(
target_span
,
format!
(
"has type `{}`"
,
target_ty
));
}
// If available, use the scope span to annotate the drop location.
// If available, use the scope span to annotate the drop location.
if
let
Some
(
scope_span
)
=
scope_span
{
if
let
Some
(
scope_span
)
=
scope_span
{
...
@@ -1372,6 +1422,7 @@ fn note_obligation_cause_for_async_await(
...
@@ -1372,6 +1422,7 @@ fn note_obligation_cause_for_async_await(
span
,
span
,
&
format!
(
"{} as this value is used across an {}"
,
trait_explanation
,
await_or_yield
),
&
format!
(
"{} as this value is used across an {}"
,
trait_explanation
,
await_or_yield
),
);
);
}
if
let
Some
(
expr_id
)
=
expr
{
if
let
Some
(
expr_id
)
=
expr
{
let
expr
=
hir
.expect_expr
(
expr_id
);
let
expr
=
hir
.expect_expr
(
expr_id
);
...
@@ -1716,6 +1767,29 @@ fn visit_body(&mut self, body: &'v hir::Body<'v>) {
...
@@ -1716,6 +1767,29 @@ fn visit_body(&mut self, body: &'v hir::Body<'v>) {
}
}
}
}
/// Collect all the awaited expressions within the input expression.
#[derive(Default)]
struct
AwaitsVisitor
{
awaits
:
Vec
<
hir
::
HirId
>
,
}
impl
<
'v
>
Visitor
<
'v
>
for
AwaitsVisitor
{
type
Map
=
hir
::
intravisit
::
ErasedMap
<
'v
>
;
fn
nested_visit_map
(
&
mut
self
)
->
hir
::
intravisit
::
NestedVisitorMap
<
Self
::
Map
>
{
hir
::
intravisit
::
NestedVisitorMap
::
None
}
fn
visit_expr
(
&
mut
self
,
ex
:
&
'v
hir
::
Expr
<
'v
>
)
{
match
ex
.kind
{
hir
::
ExprKind
::
Yield
(
_
,
hir
::
YieldSource
::
Await
{
expr
:
Some
(
id
)
})
=>
self
.awaits
.push
(
id
),
_
=>
(),
}
hir
::
intravisit
::
walk_expr
(
self
,
ex
)
}
}
pub
trait
NextTypeParamName
{
pub
trait
NextTypeParamName
{
fn
next_type_param_name
(
&
self
,
name
:
Option
<&
str
>
)
->
String
;
fn
next_type_param_name
(
&
self
,
name
:
Option
<&
str
>
)
->
String
;
}
}
...
...
src/librustc_typeck/check/expr.rs
浏览文件 @
aed7c30e
...
@@ -1797,7 +1797,7 @@ fn check_expr_yield(
...
@@ -1797,7 +1797,7 @@ fn check_expr_yield(
// we know that the yield type must be `()`; however, the context won't contain this
// we know that the yield type must be `()`; however, the context won't contain this
// information. Hence, we check the source of the yield expression here and check its
// information. Hence, we check the source of the yield expression here and check its
// value's type against `()` (this check should always hold).
// value's type against `()` (this check should always hold).
None
if
src
==
&
hir
::
YieldSource
::
Await
=>
{
None
if
src
.is_await
()
=>
{
self
.check_expr_coercable_to_type
(
&
value
,
self
.tcx
.mk_unit
());
self
.check_expr_coercable_to_type
(
&
value
,
self
.tcx
.mk_unit
());
self
.tcx
.mk_unit
()
self
.tcx
.mk_unit
()
}
}
...
...
src/test/ui/async-await/issue-68112.stderr
浏览文件 @
aed7c30e
...
@@ -8,16 +8,13 @@ LL | require_send(send_fut);
...
@@ -8,16 +8,13 @@ LL | require_send(send_fut);
| ^^^^^^^^^^^^ future created by async block is not `Send`
| ^^^^^^^^^^^^ future created by async block is not `Send`
|
|
= help: the trait `std::marker::Sync` is not implemented for `std::cell::RefCell<i32>`
= help: the trait `std::marker::Sync` is not implemented for `std::cell::RefCell<i32>`
note: future is not `Send` as this value is used
across
an await
note: future is not `Send` as this value is used
in
an await
--> $DIR/issue-68112.rs:3
2:9
--> $DIR/issue-68112.rs:3
1:17
|
|
LL | let non_send_fut = make_non_send_future1();
LL | let non_send_fut = make_non_send_future1();
| ------------ created here
| ------------ created here
LL | let _ = non_send_fut.await;
LL | let _ = non_send_fut.await;
LL | ready(0).await;
| ^^^^^^^^^^^^ await occurs here
| ^^^^^^^^ await occurs here, with `non_send_fut` maybe used later
LL | };
| - `non_send_fut` is later dropped here
error[E0277]: `std::cell::RefCell<i32>` cannot be shared between threads safely
error[E0277]: `std::cell::RefCell<i32>` cannot be shared between threads safely
--> $DIR/issue-68112.rs:49:5
--> $DIR/issue-68112.rs:49:5
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录