Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 01af504

Browse files
committedOct 4, 2022
Auto merge of #102666 - matthiaskrgr:rollup-tuge18t, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #102241 (Package `rust-docs-json` into nightly components (take 3)) - #102488 (Check generic argument compatibility when projecting assoc ty) - #102647 (Only allow ~const bounds for traits with #[const_trait]) - #102648 (Add test for #102605) - #102651 (It's not about types or consts, but the lack of regions) - #102653 (resolve instance: missing value to `delay_span_bug`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 02cd79a + db94aed commit 01af504

File tree

73 files changed

+434
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+434
-201
lines changed
 

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ pub(crate) fn type_check<'mir, 'tcx>(
236236
.unwrap();
237237
let mut hidden_type = infcx.resolve_vars_if_possible(decl.hidden_type);
238238
trace!("finalized opaque type {:?} to {:#?}", opaque_type_key, hidden_type.ty.kind());
239-
if hidden_type.has_infer_types_or_consts() {
239+
if hidden_type.has_non_region_infer() {
240240
infcx.tcx.sess.delay_span_bug(
241241
decl.hidden_type.span,
242242
&format!("could not resolve {:#?}", hidden_type.ty.kind()),

‎compiler/rustc_hir_analysis/src/check/fn_ctxt/_impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
9191
mutate_fulfillment_errors: impl Fn(&mut Vec<traits::FulfillmentError<'tcx>>),
9292
) -> Ty<'tcx> {
9393
// No Infer()? Nothing needs doing.
94-
if !ty.has_infer_types_or_consts() {
94+
if !ty.has_non_region_infer() {
9595
debug!("no inference var, nothing needs doing");
9696
return ty;
9797
}
9898

9999
// If `ty` is a type variable, see whether we already know what it is.
100100
ty = self.resolve_vars_if_possible(ty);
101-
if !ty.has_infer_types_or_consts() {
101+
if !ty.has_non_region_infer() {
102102
debug!(?ty);
103103
return ty;
104104
}

0 commit comments

Comments
 (0)
Please sign in to comment.