Skip to content

Fix breakages with nightly rustc #1030

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

Merged
copybara-service merged 1 commit into from
May 14, 2026
Merged

Fix breakages with nightly rustc #1030

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion bazel/llvm.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _llvm_loader_repository(repository_ctx):
executable = False,
)

LLVM_COMMIT_SHA = "87d42c13cd6b119240781f31e5869981d500a186"
LLVM_COMMIT_SHA = "eeca78019189a5559a694bb4774fec3e6ae07096"

def llvm_loader_repository_dependencies():
# This *declares* the dependency, but it won't actually be *downloaded* unless it's used.
Expand Down
6 changes: 5 additions & 1 deletion cc_bindings_from_rs/generate_bindings/generate_struct_and_union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,8 @@ fn generate_variant_ctor<'tcx>(
bail!("Field `{}` is not public", field_def.name)
}
let ty = field_def.ty(tcx, adt_generic_args);
#[rustversion::since(2026-05-13)]
let ty = crate::normalize_ty(tcx, tcx.param_env(field_def.did), ty);

let is_default =
query_compiler::does_type_implement_trait(tcx, ty, default_trait_id, []);
Expand All @@ -1223,7 +1225,7 @@ fn generate_variant_ctor<'tcx>(

Ok(ty)
})
.collect::<Result<Vec<_>>>()?;
.collect::<Result<Vec<Ty<'tcx>>>>()?;

// If we fail to convert a field type, don't generate a constructor.
// Our uncovertible fields will be replaced by a blob of bytes that we do not want to appear
Expand Down Expand Up @@ -1471,6 +1473,8 @@ pub(crate) fn generate_fields<'tcx>(
field_iter
.map(|IndexedVariantField { index, field_def }| {
let ty = field_def.ty(tcx, adt_generic_args);
#[rustversion::since(2026-05-13)]
let ty = crate::normalize_ty(tcx, tcx.param_env(field_def.did), ty);
let size = get_layout(tcx, ty).map(|layout| layout.size().bytes());
let type_info = size.and_then(|size| {
if is_bridged_type(db, ty)
Expand Down
Loading