Skip to content

Commit 4641004

Browse files
committed
Rename module astconv to hir_ty_lowering
1 parent 8cf3ea0 commit 4641004

File tree

20 files changed

+28
-26
lines changed

20 files changed

+28
-26
lines changed

compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ use std::cell::Cell;
4040
use std::iter;
4141
use std::ops::Bound;
4242

43-
use crate::astconv::HirTyLowerer;
4443
use crate::check::intrinsic::intrinsic_operation_unsafety;
4544
use crate::errors;
45+
use crate::hir_ty_lowering::HirTyLowerer;
4646
pub use type_of::test_opaque_hidden_types;
4747

4848
mod generics_of;

compiler/rustc_hir_analysis/src/collect/item_bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::ItemCtxt;
2-
use crate::astconv::{HirTyLowerer, PredicateFilter};
2+
use crate::hir_ty_lowering::{HirTyLowerer, PredicateFilter};
33
use rustc_hir as hir;
44
use rustc_infer::traits::util;
55
use rustc_middle::ty::GenericArgs;

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::astconv::{HirTyLowerer, OnlySelfBounds, PredicateFilter};
21
use crate::bounds::Bounds;
32
use crate::collect::ItemCtxt;
43
use crate::constrained_generic_params as cgp;
4+
use crate::hir_ty_lowering::{HirTyLowerer, OnlySelfBounds, PredicateFilter};
55
use hir::{HirId, Node};
66
use rustc_data_structures::fx::FxIndexSet;
77
use rustc_hir as hir;

compiler/rustc_hir_analysis/src/collect/type_of.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ use rustc_middle::ty::{self, ImplTraitInTraitData, IsSuggestable, Ty, TyCtxt, Ty
99
use rustc_span::symbol::Ident;
1010
use rustc_span::{Span, DUMMY_SP};
1111

12-
use crate::astconv::HirTyLowerer;
1312
use crate::errors::TypeofReservedKeywordUsed;
13+
use crate::hir_ty_lowering::HirTyLowerer;
1414

1515
use super::bad_placeholder;
1616
use super::ItemCtxt;

compiler/rustc_hir_analysis/src/astconv/bounds.rs renamed to compiler/rustc_hir_analysis/src/hir_ty_lowering/bounds.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ use rustc_span::{ErrorGuaranteed, Span};
99
use rustc_trait_selection::traits;
1010
use smallvec::SmallVec;
1111

12-
use crate::astconv::{
13-
HirTyLowerer, LoweredBinding, LoweredBindingKind, OnlySelfBounds, PredicateFilter,
14-
};
1512
use crate::bounds::Bounds;
1613
use crate::errors;
14+
use crate::hir_ty_lowering::{
15+
HirTyLowerer, LoweredBinding, LoweredBindingKind, OnlySelfBounds, PredicateFilter,
16+
};
1717

1818
impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
1919
/// Adds a `Sized` bound to the list of `bounds` unless the HIR bounds contain any of

compiler/rustc_hir_analysis/src/astconv/errors.rs renamed to compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use crate::astconv::{HirTyLowerer, LoweredBindingKind};
21
use crate::errors::{
32
self, AssocTypeBindingNotAllowed, ManualImplementation, MissingTypeParams,
43
ParenthesizedFnTraitExpansion,
54
};
65
use crate::fluent_generated as fluent;
6+
use crate::hir_ty_lowering::{HirTyLowerer, LoweredBindingKind};
77
use crate::traits::error_reporting::report_object_safety_error;
88
use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
99
use rustc_data_structures::sorted_map::SortedMap;

compiler/rustc_hir_analysis/src/astconv/generics.rs renamed to compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::IsMethodCall;
2-
use crate::astconv::{
2+
use crate::hir_ty_lowering::{
33
errors::prohibit_assoc_ty_binding, ExplicitLateBound, GenericArgCountMismatch,
44
GenericArgCountResult, GenericArgPosition, GenericArgsLowerer,
55
};

compiler/rustc_hir_analysis/src/astconv/mod.rs renamed to compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ pub mod generics;
1313
mod lint;
1414
mod object_safety;
1515

16-
use crate::astconv::errors::prohibit_assoc_ty_binding;
17-
use crate::astconv::generics::{check_generic_arg_count, create_args_for_parent_generic_args};
1816
use crate::bounds::Bounds;
1917
use crate::collect::HirPlaceholderCollector;
2018
use crate::errors::AmbiguousLifetimeBound;
19+
use crate::hir_ty_lowering::errors::prohibit_assoc_ty_binding;
20+
use crate::hir_ty_lowering::generics::{
21+
check_generic_arg_count, create_args_for_parent_generic_args,
22+
};
2123
use crate::middle::resolve_bound_vars as rbv;
2224
use crate::require_c_abi_if_c_variadic;
2325
use rustc_ast::TraitObjectSyntax;

compiler/rustc_hir_analysis/src/astconv/object_safety.rs renamed to compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use crate::astconv::{GenericArgCountMismatch, GenericArgCountResult, OnlySelfBounds};
21
use crate::bounds::Bounds;
32
use crate::errors::TraitObjectDeclaredWithNoTraits;
3+
use crate::hir_ty_lowering::{GenericArgCountMismatch, GenericArgCountResult, OnlySelfBounds};
44
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
55
use rustc_errors::{codes::*, struct_span_code_err};
66
use rustc_hir as hir;

0 commit comments

Comments
 (0)