Skip to content

Commit dbf55ce

Browse files
committed
remove unneeded To type parameter of SetPointerBuilder
The `To` parameter was added back before we had the `Owned` trait. Now that `Ownded` markers can carry the necessary type constraints for generic setters, we no longer need `To`.
1 parent f40b6dc commit dbf55ce

18 files changed

+86
-89
lines changed

capnp-rpc/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ impl <A> ImbuedMessageBuilder<A> where A: ::capnp::message::Allocator {
354354
root.get_as()
355355
}
356356

357-
pub fn set_root<To, From>(&mut self, value: From) -> ::capnp::Result<()>
358-
where From: ::capnp::traits::SetPointerBuilder<To>
357+
pub fn set_root<From>(&mut self, value: From) -> ::capnp::Result<()>
358+
where From: ::capnp::traits::SetPointerBuilder
359359
{
360360
use capnp::traits::ImbueMut;
361361
let mut root: ::capnp::any_pointer::Builder = self.builder.get_root()?;

capnp-rpc/src/rpc_capnp.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ pub mod message {
215215
}
216216
}
217217

218-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
218+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
219219
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
220220
}
221221

@@ -623,7 +623,7 @@ pub mod bootstrap {
623623
}
624624
}
625625

626-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
626+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
627627
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
628628
}
629629

@@ -794,7 +794,7 @@ pub mod call {
794794
}
795795
}
796796

797-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
797+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
798798
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
799799
}
800800

@@ -1014,7 +1014,7 @@ pub mod call {
10141014
}
10151015
}
10161016

1017-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1017+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
10181018
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
10191019
}
10201020

@@ -1233,7 +1233,7 @@ pub mod return_ {
12331233
}
12341234
}
12351235

1236-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1236+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
12371237
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
12381238
}
12391239

@@ -1468,7 +1468,7 @@ pub mod finish {
14681468
}
14691469
}
14701470

1471-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1471+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
14721472
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
14731473
}
14741474

@@ -1627,7 +1627,7 @@ pub mod resolve {
16271627
}
16281628
}
16291629

1630-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1630+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
16311631
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
16321632
}
16331633

@@ -1806,7 +1806,7 @@ pub mod release {
18061806
}
18071807
}
18081808

1809-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1809+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
18101810
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
18111811
}
18121812

@@ -1946,7 +1946,7 @@ pub mod disembargo {
19461946
}
19471947
}
19481948

1949-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
1949+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
19501950
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
19511951
}
19521952

@@ -2117,7 +2117,7 @@ pub mod disembargo {
21172117
}
21182118
}
21192119

2120-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2120+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
21212121
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
21222122
}
21232123

@@ -2302,7 +2302,7 @@ pub mod provide {
23022302
}
23032303
}
23042304

2305-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2305+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
23062306
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
23072307
}
23082308

@@ -2472,7 +2472,7 @@ pub mod accept {
24722472
}
24732473
}
24742474

2475-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2475+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
24762476
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
24772477
}
24782478

@@ -2635,7 +2635,7 @@ pub mod join {
26352635
}
26362636
}
26372637

2638-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2638+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
26392639
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
26402640
}
26412641

@@ -2812,7 +2812,7 @@ pub mod message_target {
28122812
}
28132813
}
28142814

2815-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2815+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
28162816
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
28172817
}
28182818

@@ -2980,7 +2980,7 @@ pub mod payload {
29802980
}
29812981
}
29822982

2983-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
2983+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
29842984
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
29852985
}
29862986

@@ -3170,7 +3170,7 @@ pub mod cap_descriptor {
31703170
}
31713171
}
31723172

3173-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
3173+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
31743174
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
31753175
}
31763176

@@ -3387,7 +3387,7 @@ pub mod promised_answer {
33873387
}
33883388
}
33893389

3390-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
3390+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
33913391
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
33923392
}
33933393

@@ -3540,7 +3540,7 @@ pub mod promised_answer {
35403540
}
35413541
}
35423542

3543-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
3543+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
35443544
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
35453545
}
35463546

@@ -3696,7 +3696,7 @@ pub mod third_party_cap_descriptor {
36963696
}
36973697
}
36983698

3699-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
3699+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
37003700
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
37013701
}
37023702

@@ -3852,7 +3852,7 @@ pub mod exception {
38523852
}
38533853
}
38543854

3855-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
3855+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
38563856
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
38573857
}
38583858

capnp-rpc/src/rpc_twoparty_capnp.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub mod vat_id {
110110
}
111111
}
112112

113-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
113+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
114114
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
115115
}
116116

@@ -235,7 +235,7 @@ pub mod provision_id {
235235
}
236236
}
237237

238-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
238+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
239239
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
240240
}
241241

@@ -356,7 +356,7 @@ pub mod recipient_id {
356356
}
357357
}
358358

359-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
359+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
360360
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
361361
}
362362

@@ -469,7 +469,7 @@ pub mod third_party_cap_id {
469469
}
470470
}
471471

472-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
472+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
473473
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
474474
}
475475

@@ -594,7 +594,7 @@ pub mod join_key_part {
594594
}
595595
}
596596

597-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
597+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
598598
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
599599
}
600600

@@ -746,7 +746,7 @@ pub mod join_result {
746746
}
747747
}
748748

749-
impl <'a,> ::capnp::traits::SetPointerBuilder<Builder<'a,>> for Reader<'a,> {
749+
impl <'a,> ::capnp::traits::SetPointerBuilder for Reader<'a,> {
750750
fn set_pointer_builder<'b>(pointer: ::capnp::private::layout::PointerBuilder<'b>, value: Reader<'a,>, canonicalize: bool) -> ::capnp::Result<()> { pointer.set_struct(&value.reader, canonicalize) }
751751
}
752752

capnp/src/any_pointer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl <'a> FromPointerReader<'a> for Reader<'a> {
9999
}
100100
}
101101

102-
impl <'a> crate::traits::SetPointerBuilder<Builder<'a>> for Reader<'a> {
102+
impl <'a> crate::traits::SetPointerBuilder for Reader<'a> {
103103
fn set_pointer_builder<'b>(mut pointer: crate::private::layout::PointerBuilder<'b>,
104104
value: Reader<'a>,
105105
canonicalize: bool) -> Result<()> {
@@ -148,8 +148,8 @@ impl <'a> Builder<'a> {
148148
FromPointerBuilder::init_pointer(self.builder, size)
149149
}
150150

151-
pub fn set_as<To, From : SetPointerBuilder<To>>(self, value: From) -> Result<()> {
152-
SetPointerBuilder::<To>::set_pointer_builder(self.builder, value, false)
151+
pub fn set_as<From: SetPointerBuilder>(self, value: From) -> Result<()> {
152+
SetPointerBuilder::set_pointer_builder(self.builder, value, false)
153153
}
154154

155155
// XXX value should be a user client.

capnp/src/any_pointer_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl <'a> FromPointerBuilder<'a> for Builder<'a> {
115115
}
116116
}
117117

118-
impl <'a> crate::traits::SetPointerBuilder<Builder<'a>> for Reader<'a> {
118+
impl <'a> crate::traits::SetPointerBuilder for Reader<'a> {
119119
fn set_pointer_builder<'b>(pointer: PointerBuilder<'b>,
120120
value: Reader<'a>,
121121
canonicalize: bool) -> Result<()> {

capnp/src/capability_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl <'a, T> Builder<'a, T> where T: FromClientHook {
143143
}
144144
}
145145

146-
impl <'a, T> crate::traits::SetPointerBuilder<Builder<'a, T>> for Reader<'a, T>
146+
impl <'a, T> crate::traits::SetPointerBuilder for Reader<'a, T>
147147
where T: FromClientHook
148148
{
149149
fn set_pointer_builder<'b>(pointer: crate::private::layout::PointerBuilder<'b>,

capnp/src/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl <'a> crate::traits::FromPointerBuilder<'a> for Builder<'a> {
6969
}
7070
}
7171

72-
impl <'a> crate::traits::SetPointerBuilder<Builder<'a>> for Reader<'a> {
72+
impl <'a> crate::traits::SetPointerBuilder for Reader<'a> {
7373
fn set_pointer_builder<'b>(pointer: PointerBuilder<'b>,
7474
value: Reader<'a>,
7575
_canonicalize: bool) -> Result<()> {

capnp/src/data_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl <'a> Builder<'a> {
124124
}
125125

126126

127-
impl <'a> crate::traits::SetPointerBuilder<Builder<'a>> for Reader<'a> {
127+
impl <'a> crate::traits::SetPointerBuilder for Reader<'a> {
128128
fn set_pointer_builder<'b>(pointer: crate::private::layout::PointerBuilder<'b>,
129129
value: Reader<'a>,
130130
canonicalize: bool) -> Result<()> {

capnp/src/enum_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl <'a, T : ToU16 + FromU16> Builder<'a, T> {
130130
}
131131
}
132132

133-
impl <'a, T> crate::traits::SetPointerBuilder<Builder<'a, T>> for Reader<'a, T> {
133+
impl <'a, T> crate::traits::SetPointerBuilder for Reader<'a, T> {
134134
fn set_pointer_builder<'b>(pointer: crate::private::layout::PointerBuilder<'b>,
135135
value: Reader<'a, T>,
136136
canonicalize: bool) -> Result<()> {

capnp/src/list_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl <'a, T> Builder<'a, T> where T: for<'b> crate::traits::Owned<'b> {
131131
}
132132
}
133133

134-
impl <'a, T> crate::traits::SetPointerBuilder<Builder<'a, T>> for Reader<'a, T>
134+
impl <'a, T> crate::traits::SetPointerBuilder for Reader<'a, T>
135135
where T: for<'b> crate::traits::Owned<'b>
136136
{
137137
fn set_pointer_builder<'b>(pointer: crate::private::layout::PointerBuilder<'b>,

0 commit comments

Comments
 (0)