Auto merge of #47845 - Zoxc:gen-fixes, r=nikomatsakis

Generator bugfixes

r? @nikomatsakis

diff --cc src/librustc/middle/region.rs
Simple merge

diff --cc src/librustc/traits/error_reporting.rs
Simple merge

diff --cc src/librustc/traits/mod.rs
Simple merge

diff --cc src/librustc/ty/sty.rs
Simple merge

diff --cc src/librustc_mir/borrow_check/nll/type_check/mod.rs
Simple merge

diff --cc src/librustc_mir/dataflow/impls/mod.rs
Simple merge

diff --cc src/librustc_mir/dataflow/mod.rs
index bd63198ecd0d273c127723a49efb48e62b00345d,8156ff11f9bbe311176657de90526dcd9a6f57d2..291c22b5e1ed0f0aa32081534a97ff24f396cd21
--- 1/src/librustc_mir/dataflow/mod.rs
--- 2/src/librustc_mir/dataflow/mod.rs
+++ b/src/librustc_mir/dataflow/mod.rs
@@@ -26,10 -26,11 +26,11 @@@ use std::path::PathBuf
  use std::usize;
  
  pub use self::impls::{MaybeStorageLive};
 -pub use self::impls::{MaybeInitializedLvals, MaybeUninitializedLvals};
 -pub use self::impls::{DefinitelyInitializedLvals, MovingOutStatements};
 -pub use self::impls::EverInitializedLvals;
 +pub use self::impls::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 +pub use self::impls::{DefinitelyInitializedPlaces, MovingOutStatements};
 +pub use self::impls::EverInitializedPlaces;
  pub use self::impls::borrows::{Borrows, BorrowData};
+ pub use self::impls::HaveBeenBorrowedLocals;
  pub(crate) use self::impls::borrows::{ActiveBorrows, Reservations, ReserveOrActivateIndex};
  pub use self::at_location::{FlowAtLocation, FlowsAtLocation};
  pub(crate) use self::drop_flag_effects::*;

diff --cc src/librustc_typeck/check/mod.rs
Simple merge