Auto merge of #5361 - matthiaskrgr:rustup_37, r=flip1995

rustup https://github.com/rust-lang/rust/pull/69968/

changelog: none
This commit is contained in:
bors 2020-03-23 14:41:57 +00:00
commit 43bdee034f

View File

@ -234,8 +234,8 @@ fn lint_for_missing_headers<'a, 'tcx>(
if implements_trait(cx, ret_ty, future, &[]); if implements_trait(cx, ret_ty, future, &[]);
if let ty::Opaque(_, subs) = ret_ty.kind; if let ty::Opaque(_, subs) = ret_ty.kind;
if let Some(gen) = subs.types().next(); if let Some(gen) = subs.types().next();
if let ty::Generator(def_id, subs, _) = gen.kind; if let ty::Generator(_, subs, _) = gen.kind;
if match_type(cx, subs.as_generator().return_ty(def_id, cx.tcx), &paths::RESULT); if match_type(cx, subs.as_generator().return_ty(), &paths::RESULT);
then { then {
span_lint( span_lint(
cx, cx,