Skip to content

Commit ca48146

Browse files
tamirdtamird
committed
TemplateParameters.used_template_params doesn't return Option
1 parent 7eb55b6 commit ca48146

File tree

3 files changed

+54
-73
lines changed

3 files changed

+54
-73
lines changed

‎src/codegen/mod.rs

+42-57
Original file line numberDiff line numberDiff line change
@@ -298,16 +298,11 @@ impl AppendImplicitTemplateParams for quote::Tokens {
298298
_ => {},
299299
}
300300

301-
if let Some(params) = item.used_template_params(ctx) {
302-
if params.is_empty() {
303-
return;
304-
}
305-
306-
let params = params.into_iter().map(|p| {
307-
p.try_to_rust_ty(ctx, &())
308-
.expect("template params cannot fail to be a rust type")
309-
});
310-
301+
let params: Vec<_> = item.used_template_params(ctx).iter().map(|p| {
302+
p.try_to_rust_ty(ctx, &())
303+
.expect("template params cannot fail to be a rust type")
304+
}).collect();
305+
if !params.is_empty() {
311306
self.append(quote! {
312307
< #( #params ),* >
313308
});
@@ -632,15 +627,10 @@ impl CodeGenerator for Type {
632627
return;
633628
}
634629

635-
let mut outer_params = item.used_template_params(ctx)
636-
.and_then(|ps| if ps.is_empty() {
637-
None
638-
} else {
639-
Some(ps)
640-
});
630+
let mut outer_params = item.used_template_params(ctx);
641631

642632
let inner_rust_type = if item.is_opaque(ctx, &()) {
643-
outer_params = None;
633+
outer_params = vec![];
644634
self.to_opaque(ctx, item)
645635
} else {
646636
// Its possible that we have better layout information than
@@ -695,7 +685,7 @@ impl CodeGenerator for Type {
695685
'A'...'Z' | 'a'...'z' | '0'...'9' | ':' | '_' | ' ' => true,
696686
_ => false,
697687
}) &&
698-
outer_params.is_none() &&
688+
outer_params.is_empty() &&
699689
inner_item.expect_type().canonical_type(ctx).is_enum()
700690
{
701691
tokens.append(quote! {
@@ -714,25 +704,23 @@ impl CodeGenerator for Type {
714704
pub type #rust_name
715705
});
716706

717-
if let Some(params) = outer_params {
718-
let params: Vec<_> = params.into_iter()
719-
.filter_map(|p| p.as_template_param(ctx, &()))
720-
.collect();
721-
if params.iter().any(|p| ctx.resolve_type(*p).is_invalid_type_param()) {
722-
warn!(
723-
"Item contained invalid template \
724-
parameter: {:?}",
725-
item
726-
);
727-
return;
728-
}
729-
730-
let params = params.iter()
731-
.map(|p| {
732-
p.try_to_rust_ty(ctx, &())
733-
.expect("type parameters can always convert to rust ty OK")
734-
});
707+
let params: Vec<_> = outer_params.into_iter()
708+
.filter_map(|p| p.as_template_param(ctx, &()))
709+
.collect();
710+
if params.iter().any(|p| ctx.resolve_type(*p).is_invalid_type_param()) {
711+
warn!(
712+
"Item contained invalid template \
713+
parameter: {:?}",
714+
item
715+
);
716+
return;
717+
}
718+
let params: Vec<_> = params.iter().map(|p| {
719+
p.try_to_rust_ty(ctx, &())
720+
.expect("type parameters can always convert to rust ty OK")
721+
}).collect();
735722

723+
if !params.is_empty() {
736724
tokens.append(quote! {
737725
< #( #params ),* >
738726
});
@@ -1414,8 +1402,6 @@ impl CodeGenerator for CompInfo {
14141402
return;
14151403
}
14161404

1417-
let used_template_params = item.used_template_params(ctx);
1418-
14191405
let ty = item.expect_type();
14201406
let layout = ty.layout(ctx);
14211407
let mut packed = self.is_packed(ctx, &layout);
@@ -1597,21 +1583,19 @@ impl CodeGenerator for CompInfo {
15971583

15981584
let mut generic_param_names = vec![];
15991585

1600-
if let Some(ref params) = used_template_params {
1601-
for (idx, ty) in params.iter().enumerate() {
1602-
let param = ctx.resolve_type(*ty);
1603-
let name = param.name().unwrap();
1604-
let ident = ctx.rust_ident(name);
1605-
generic_param_names.push(ident.clone());
1586+
for (idx, ty) in item.used_template_params(ctx).iter().enumerate() {
1587+
let param = ctx.resolve_type(*ty);
1588+
let name = param.name().unwrap();
1589+
let ident = ctx.rust_ident(name);
1590+
generic_param_names.push(ident.clone());
16061591

1607-
let prefix = ctx.trait_prefix();
1608-
let field_name = ctx.rust_ident(format!("_phantom_{}", idx));
1609-
fields.push(quote! {
1610-
pub #field_name : ::#prefix::marker::PhantomData<
1611-
::#prefix::cell::UnsafeCell<#ident>
1612-
> ,
1613-
});
1614-
}
1592+
let prefix = ctx.trait_prefix();
1593+
let field_name = ctx.rust_ident(format!("_phantom_{}", idx));
1594+
fields.push(quote! {
1595+
pub #field_name : ::#prefix::marker::PhantomData<
1596+
::#prefix::cell::UnsafeCell<#ident>
1597+
> ,
1598+
});
16151599
}
16161600

16171601
let generics = if !generic_param_names.is_empty() {
@@ -1664,11 +1648,13 @@ impl CodeGenerator for CompInfo {
16641648
ctx.options().derive_default && !self.is_forward_declaration();
16651649
}
16661650

1651+
let all_template_params = item.all_template_params(ctx);
1652+
16671653
if item.can_derive_copy(ctx) && !item.annotations().disallow_copy() {
16681654
derives.push("Copy");
16691655

16701656
if ctx.options().rust_features().builtin_clone_impls ||
1671-
used_template_params.is_some()
1657+
!all_template_params.is_empty()
16721658
{
16731659
// FIXME: This requires extra logic if you have a big array in a
16741660
// templated struct. The reason for this is that the magic:
@@ -1750,7 +1736,7 @@ impl CodeGenerator for CompInfo {
17501736
);
17511737
}
17521738

1753-
if used_template_params.is_none() {
1739+
if all_template_params.is_empty() {
17541740
if !is_opaque {
17551741
for var in self.inner_vars() {
17561742
ctx.resolve_item(*var).codegen(ctx, result, &());
@@ -3007,7 +2993,6 @@ impl TryToRustTy for Type {
30072993
TypeKind::TemplateAlias(..) |
30082994
TypeKind::Alias(..) => {
30092995
let template_params = item.used_template_params(ctx)
3010-
.unwrap_or(vec![])
30112996
.into_iter()
30122997
.filter(|param| param.is_template_param(ctx, &()))
30132998
.collect::<Vec<_>>();
@@ -3026,9 +3011,9 @@ impl TryToRustTy for Type {
30263011
}
30273012
}
30283013
TypeKind::Comp(ref info) => {
3029-
let template_params = item.used_template_params(ctx);
3014+
let template_params = item.all_template_params(ctx);
30303015
if info.has_non_type_template_params() ||
3031-
(item.is_opaque(ctx, &()) && template_params.is_some())
3016+
(item.is_opaque(ctx, &()) && !template_params.is_empty())
30323017
{
30333018
return self.try_to_opaque(ctx, item);
30343019
}

‎src/ir/analysis/derive_copy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ impl<'ctx> MonotoneFramework for CannotDeriveCopy<'ctx> {
247247

248248
// https://github.com/rust-lang/rust/issues/36640
249249
if !info.self_template_params(self.ctx).is_empty() ||
250-
item.used_template_params(self.ctx).is_some()
250+
!item.all_template_params(self.ctx).is_empty()
251251
{
252252
trace!(
253253
" comp cannot derive copy because issue 36640"

‎src/ir/template.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ use parse::ClangItemParser;
9292
/// ----+------+-----+----------------------+
9393
/// ... |Decl. | ... | used_template_params |
9494
/// ----+------+-----+----------------------+
95-
/// ... |Foo | ... | Some([T, U]) |
96-
/// ... |Bar | ... | Some([V]) |
97-
/// ... |Inner | ... | None |
98-
/// ... |Lol | ... | Some([T]) |
99-
/// ... |Wtf | ... | Some([T]) |
100-
/// ... |Qux | ... | None |
95+
/// ... |Foo | ... | [T, U] |
96+
/// ... |Bar | ... | [V] |
97+
/// ... |Inner | ... | [] |
98+
/// ... |Lol | ... | [T] |
99+
/// ... |Wtf | ... | [T] |
100+
/// ... |Qux | ... | [] |
101101
/// ----+------+-----+----------------------+
102102
pub trait TemplateParameters {
103103
/// Get the set of `ItemId`s that make up this template declaration's free
@@ -144,7 +144,7 @@ pub trait TemplateParameters {
144144
/// Get only the set of template parameters that this item uses. This is a
145145
/// subset of `all_template_params` and does not necessarily contain any of
146146
/// `self_template_params`.
147-
fn used_template_params(&self, ctx: &BindgenContext) -> Option<Vec<TypeId>>
147+
fn used_template_params(&self, ctx: &BindgenContext) -> Vec<TypeId>
148148
where
149149
Self: AsRef<ItemId>,
150150
{
@@ -154,14 +154,10 @@ pub trait TemplateParameters {
154154
);
155155

156156
let id = *self.as_ref();
157-
let all_template_params: Vec<_> = ctx.resolve_item(id).all_template_params(ctx);
158-
if all_template_params.len() > 0 {
159-
Some(all_template_params.into_iter()
160-
.filter(|p| ctx.uses_template_parameter(id, *p))
161-
.collect())
162-
} else {
163-
None
164-
}
157+
ctx.resolve_item(id).all_template_params(ctx)
158+
.into_iter()
159+
.filter(|p| ctx.uses_template_parameter(id, *p))
160+
.collect()
165161
}
166162
}
167163

0 commit comments

Comments
 (0)