diff options
| author | bors <bors@rust-lang.org> | 2019-10-04 07:27:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-04 07:27:59 +0000 |
| commit | 9e35a2811d8c65e9473176b8656a3201b7e152c7 (patch) | |
| tree | 2d3c6267ad0c267bd7401d6b2b850eeb73888ab9 /src/librustc_codegen_utils | |
| parent | 31d75c4e9c5318e880601d3c2cc71e5df094a120 (diff) | |
| parent | aacc89a1dde9aa7f3dc76c38c411a3d6df922aad (diff) | |
Auto merge of #65087 - Centril:rollup-skxq0zr, r=Centril
Rollup of 5 pull requests Successful merges: - #64749 (Fix most remaining Polonius test differences) - #64817 (Replace ClosureSubsts with SubstsRef) - #64874 (Simplify ExprUseVisitor) - #65026 (metadata: Some crate loading cleanup) - #65073 (Remove `borrowck_graphviz_postflow` from test) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils')
| -rw-r--r-- | src/librustc_codegen_utils/symbol_names/legacy.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_utils/symbol_names/v0.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_utils/symbol_names/legacy.rs b/src/librustc_codegen_utils/symbol_names/legacy.rs index a9866c8c0b2..5bcb3b4ceb3 100644 --- a/src/librustc_codegen_utils/symbol_names/legacy.rs +++ b/src/librustc_codegen_utils/symbol_names/legacy.rs @@ -224,7 +224,7 @@ impl Printer<'tcx> for SymbolPrinter<'tcx> { ty::Opaque(def_id, substs) | ty::Projection(ty::ProjectionTy { item_def_id: def_id, substs }) | ty::UnnormalizedProjection(ty::ProjectionTy { item_def_id: def_id, substs }) | - ty::Closure(def_id, ty::ClosureSubsts { substs }) | + ty::Closure(def_id, substs) | ty::Generator(def_id, ty::GeneratorSubsts { substs }, _) => { self.print_def_path(def_id, substs) } diff --git a/src/librustc_codegen_utils/symbol_names/v0.rs b/src/librustc_codegen_utils/symbol_names/v0.rs index a63236305dc..2ad699d7c6f 100644 --- a/src/librustc_codegen_utils/symbol_names/v0.rs +++ b/src/librustc_codegen_utils/symbol_names/v0.rs @@ -414,7 +414,7 @@ impl Printer<'tcx> for SymbolMangler<'tcx> { ty::Opaque(def_id, substs) | ty::Projection(ty::ProjectionTy { item_def_id: def_id, substs }) | ty::UnnormalizedProjection(ty::ProjectionTy { item_def_id: def_id, substs }) | - ty::Closure(def_id, ty::ClosureSubsts { substs }) | + ty::Closure(def_id, substs) | ty::Generator(def_id, ty::GeneratorSubsts { substs }, _) => { self = self.print_def_path(def_id, substs)?; } |