Skip to content

Recognize Iterator trait via DefId, not def path. #1039

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
+9 −5
Open

Recognize Iterator trait via DefId, not def path. #1039

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
14 changes: 9 additions & 5 deletions cc_bindings_from_rs/generate_bindings/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,6 +1017,7 @@ fn generate_const<'tcx>(db: &BindingsGenerator<'tcx>, def_id: DefId) -> Result<A
// Implementation of `BindingsGenerator::supported_traits`.
fn supported_traits(db: &BindingsGenerator<'_>) -> Rc<[DefId]> {
let tcx = db.tcx();
let iterator_trait_id = tcx.get_diagnostic_item(sym::Iterator);

let traits = tcx
.visible_traits()
Expand All @@ -1038,11 +1039,14 @@ fn supported_traits(db: &BindingsGenerator<'_>) -> Rc<[DefId]> {
// At least for _most_ other traits - we probably still want to exclude traits that
// get idiomatic C++ bindings elsewhere, such as `Clone`, `Default`, `Drop`, `From`,
// `Index`, and `Into`.
let crate_name = tcx.crate_name(trait_id.krate);
let not_in_stdlib = crate_name.as_str() != "std"
&& crate_name.as_str() != "core"
&& crate_name.as_str() != "alloc";
not_in_stdlib || tcx.def_path_str(*trait_id) == "std::iter::Iterator"
let not_in_stdlib = {
let crate_name = tcx.crate_name(trait_id.krate);
crate_name.as_str() != "std"
&& crate_name.as_str() != "core"
&& crate_name.as_str() != "alloc"
};
let is_iterator_trait = iterator_trait_id == Some(*trait_id);
not_in_stdlib || is_iterator_trait
})
.collect::<Vec<DefId>>()
.into_boxed_slice();
Expand Down