Skip to content

Commit 7108918

Browse files
committed
Cleanups and comments
1 parent 0c98dc6 commit 7108918

File tree

7 files changed

+214
-265
lines changed

7 files changed

+214
-265
lines changed

compiler/rustc_middle/src/ty/util.rs

-1
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ impl<'tcx> TyCtxt<'tcx> {
504504
let closure_ty = self.mk_closure(closure_def_id, closure_substs);
505505
let closure_kind_ty = closure_substs.as_closure().kind_ty();
506506
let closure_kind = closure_kind_ty.to_opt_closure_kind()?;
507-
debug_assert!(!closure_ty.has_escaping_bound_vars());
508507
let env_ty = match closure_kind {
509508
ty::ClosureKind::Fn => self.mk_imm_ref(self.mk_region(env_region), closure_ty),
510509
ty::ClosureKind::FnMut => self.mk_mut_ref(self.mk_region(env_region), closure_ty),

compiler/rustc_mir/src/monomorphize/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_middle::traits;
22
use rustc_middle::ty::adjustment::CustomCoerceUnsized;
3-
use rustc_middle::ty::{self, Ty, TyCtxt, TypeFoldable};
3+
use rustc_middle::ty::{self, Ty, TyCtxt};
44

55
use rustc_hir::lang_items::LangItem;
66

@@ -15,8 +15,6 @@ fn custom_coerce_unsize_info<'tcx>(
1515
) -> CustomCoerceUnsized {
1616
let def_id = tcx.require_lang_item(LangItem::CoerceUnsized, None);
1717

18-
debug_assert!(!source_ty.has_escaping_bound_vars());
19-
debug_assert!(!target_ty.has_escaping_bound_vars());
2018
let trait_ref = ty::Binder::dummy(ty::TraitRef {
2119
def_id,
2220
substs: tcx.mk_substs_trait(source_ty, &[target_ty.into()]),

compiler/rustc_resolve/src/late.rs

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use tracing::debug;
3434

3535
mod diagnostics;
3636
crate mod lifetimes;
37-
crate mod supertraits;
3837

3938
type Res = def::Res<NodeId>;
4039

compiler/rustc_resolve/src/late/lifetimes.rs

+211-196
Large diffs are not rendered by default.

compiler/rustc_resolve/src/late/supertraits.rs

-60
This file was deleted.

compiler/rustc_trait_selection/src/traits/auto_trait.rs

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ impl<'tcx> AutoTraitFinder<'tcx> {
8282
) -> AutoTraitResult<A> {
8383
let tcx = self.tcx;
8484

85-
debug_assert!(!ty.has_escaping_bound_vars());
8685
let trait_ref = ty::TraitRef { def_id: trait_did, substs: tcx.mk_substs_trait(ty, &[]) };
8786

8887
let trait_pred = ty::Binder::dummy(trait_ref);

compiler/rustc_typeck/src/astconv/mod.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2186,13 +2186,12 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
21862186
}
21872187
}
21882188

2189+
/// Parses the programmer's textual representation of a type into our
2190+
/// internal notion of a type.
21892191
pub fn ast_ty_to_ty(&self, ast_ty: &hir::Ty<'_>) -> Ty<'tcx> {
21902192
self.ast_ty_to_ty_inner(ast_ty, false)
21912193
}
21922194

2193-
/// Parses the programmer's textual representation of a type into our
2194-
/// internal notion of a type.
2195-
///
21962195
/// Turns a `hir::Ty` into a `Ty`. For diagnostics' purposes we keep track of whether trait
21972196
/// objects are borrowed like `&dyn Trait` to avoid emitting redundant errors.
21982197
#[tracing::instrument(level = "debug", skip(self))]

0 commit comments

Comments
 (0)