Skip to content

Rollback large-futures workaround now that upstream fix https://github.com/rust-lang/rust-clippy/pull/17601 has landed #1933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rollback large-futures workaround now that upstream fix https://github.com/rust-lang/rust-clippy/pull/17601 has landed #1933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 1 addition & 45 deletions cc_bindings_from_rs/generate_bindings/query_compiler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use rustc_middle::ty::{
use rustc_span::def_id::DefId;
use rustc_span::symbol::Symbol;
use rustc_trait_selection::infer::InferCtxtExt;
use std::collections::{HashMap, HashSet};
use std::collections::HashMap;
use std::rc::Rc;

use database::BindingsGenerator;
Expand Down Expand Up @@ -248,51 +248,7 @@ pub fn is_directly_public(tcx: TyCtxt, def_id: DefId) -> bool {
}
}

/// Returns whether `ty` contains unrevealed opaque types (or aliases).
///
/// In newer rustc versions, calling `tcx.layout_of` in an empty
/// `TypingEnv::fully_monomorphized()` environment on a type containing unrevealed
/// opaque types (such as `std::env::SplitPaths`, which contains an opaque path
/// iterator) results in an internal compiler error (delayed bug: "unexpected
/// rigid alias in layout_of after normalization"). Checking beforehand allows
/// `get_layout` to gracefully bail and return an error instead.
fn has_unrevealed_opaque_type<'tcx>(
tcx: TyCtxt<'tcx>,
ty: Ty<'tcx>,
seen: &mut HashSet<DefId>,
) -> bool {
let ty =
try_normalize(tcx, ty::TypingEnv::fully_monomorphized().as_query_input(ty)).unwrap_or(ty);
for generic_arg in ty.walk() {
if let Some(inner_ty) = generic_arg.as_type() {
if matches!(inner_ty.kind(), ty::TyKind::Alias(..)) {
return true;
}
if let ty::TyKind::Adt(adt_def, substs) = inner_ty.kind() {
if !seen.insert(adt_def.did()) || adt_def.is_phantom_data() {
continue;
}
for variant in adt_def.variants() {
for field in &variant.fields {
#[rustversion::before(2026-04-19)]
let field_ty = field.ty(tcx, substs);
#[rustversion::since(2026-04-19)]
let field_ty = field.ty(tcx, substs).skip_norm_wip();
if has_unrevealed_opaque_type(tcx, field_ty, seen) {
return true;
}
}
}
}
}
}
false
}

pub fn get_layout<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Result<Layout<'tcx>> {
if has_unrevealed_opaque_type(tcx, ty, &mut HashSet::new()) {
return Err(anyhow!("Cannot compute layout for type with unrevealed opaque types: {ty}"));
}
tcx.layout_of(ty::TypingEnv::fully_monomorphized().as_query_input(ty))
.map(|ty_and_layout| ty_and_layout.layout)
.map_err(|layout_err| {
Expand Down
Loading