Skip to content

Commit 4948d2a

Browse files
committed
fix some warnings
1 parent f0cc67d commit 4948d2a

4 files changed

Lines changed: 20 additions & 14 deletions

File tree

src/hir/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl From<api::Table> for Table {
2525
opts: opts.clone(),
2626
thru: event.thru,
2727
from: event.from,
28-
data: event.data.into_iter().map(|ty| Type::from(ty)).collect(),
28+
data: event.data.into_iter().map(Type::from).collect(),
2929
}),
3030
};
3131

src/mir/builder.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,15 @@ impl Builder {
291291
});
292292
}
293293

294-
pub fn write_reserved_k(&mut self, ctx: &Ctx, func: FuncK, src: impl Into<Expr>) {
294+
pub fn write_reserved_k(
295+
&mut self,
296+
ctx: &Ctx,
297+
func: FuncK,
298+
pos: impl Into<Expr>,
299+
src: impl Into<Expr>,
300+
) {
295301
let buf = ctx.buf.var;
296-
let pos = ctx.pos.var;
302+
let pos = pos.into();
297303
let src = src.into();
298304

299305
self.instr(Instr::WriteReservedK {

src/mir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ enum Instr {
111111
WriteReservedK {
112112
func: FuncK,
113113
buf: Var,
114-
pos: Var,
114+
pos: Expr,
115115
src: Expr,
116116
},
117117

src/mir/serdes.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ impl Serdes for hir::BooleanType {
181181

182182
fn des<'ty, 'b, 'des: 'ty>(
183183
&'ty self,
184-
b: &'b mut Builder,
185-
des: &'des Des,
184+
_: &'b mut Builder,
185+
_: &'des Des,
186186
) -> impl FnOnce(&mut Builder, &Ctx) -> TVar + use<'ty, 'des> + 'ty {
187187
move |b: &mut Builder, ctx: &Ctx| {
188188
let value = b.read_k(ctx, FuncK::U8);
@@ -194,7 +194,7 @@ impl Serdes for hir::BooleanType {
194194
impl Serdes for hir::NumberType {
195195
fn ser<'ty, 'b, 'ser: 'ty>(
196196
&'ty self,
197-
b: &'b mut Builder,
197+
_: &'b mut Builder,
198198
ser: &'ser Ser,
199199
) -> impl FnOnce(&mut Builder, &Ctx, Expr) + use<'ty, 'ser> + 'ty {
200200
move |b: &mut Builder, ctx: &Ctx, from: Expr| {
@@ -208,7 +208,7 @@ impl Serdes for hir::NumberType {
208208

209209
fn des<'ty, 'b, 'des: 'ty>(
210210
&'ty self,
211-
b: &'b mut Builder,
211+
_: &'b mut Builder,
212212
des: &'des Des,
213213
) -> impl FnOnce(&mut Builder, &Ctx) -> TVar + use<'ty, 'des> + 'ty {
214214
move |b: &mut Builder, ctx: &Ctx| {
@@ -281,7 +281,7 @@ impl Serdes for hir::VectorType {
281281
impl Serdes for hir::BinaryStringType {
282282
fn ser<'ty, 'b, 'ser: 'ty>(
283283
&'ty self,
284-
b: &'b mut Builder,
284+
_: &'b mut Builder,
285285
ser: &'ser Ser,
286286
) -> impl FnOnce(&mut Builder, &Ctx, Expr) + use<'ty, 'ser> + 'ty {
287287
move |b: &mut Builder, ctx: &Ctx, from: Expr| {
@@ -296,7 +296,7 @@ impl Serdes for hir::BinaryStringType {
296296

297297
fn des<'ty, 'b, 'des: 'ty>(
298298
&'ty self,
299-
b: &'b mut Builder,
299+
_: &'b mut Builder,
300300
des: &'des Des,
301301
) -> impl FnOnce(&mut Builder, &Ctx) -> TVar + use<'ty, 'des> + 'ty {
302302
move |b: &mut Builder, ctx: &Ctx| {
@@ -309,7 +309,7 @@ impl Serdes for hir::BinaryStringType {
309309
impl Serdes for hir::Utf8StringType {
310310
fn ser<'ty, 'b, 'ser: 'ty>(
311311
&'ty self,
312-
b: &'b mut Builder,
312+
_: &'b mut Builder,
313313
ser: &'ser Ser,
314314
) -> impl FnOnce(&mut Builder, &Ctx, Expr) + use<'ty, 'ser> + 'ty {
315315
move |b: &mut Builder, ctx: &Ctx, from: Expr| {
@@ -331,7 +331,7 @@ impl Serdes for hir::Utf8StringType {
331331

332332
fn des<'ty, 'b, 'des: 'ty>(
333333
&'ty self,
334-
b: &'b mut Builder,
334+
_: &'b mut Builder,
335335
des: &'des Des,
336336
) -> impl FnOnce(&mut Builder, &Ctx) -> TVar + use<'ty, 'des> + 'ty {
337337
move |b: &mut Builder, ctx: &Ctx| {
@@ -411,7 +411,7 @@ impl Serdes for hir::SetType {
411411
});
412412

413413
ser.check_range(b, len_var.expr(), self.len.into());
414-
b.write_reserved_k(ctx, self.len.kind().into(), &len_var);
414+
b.write_reserved_k(ctx, self.len.kind().into(), &len_pos, &len_var);
415415
}
416416
}
417417

@@ -460,7 +460,7 @@ impl Serdes for hir::MapType {
460460
});
461461

462462
ser.check_range(b, len_var.expr(), self.len.into());
463-
b.write_reserved_k(ctx, self.len.kind().into(), &len_var);
463+
b.write_reserved_k(ctx, self.len.kind().into(), &len_pos, &len_var);
464464
}
465465
}
466466

0 commit comments

Comments
 (0)