Skip to content

Commit c2a31bf

Browse files
committed
Remove legacy_const_generics_indices from CallableSig
I want to remove CallableSig anyway, and it's not needed anymore.
1 parent 2be7e26 commit c2a31bf

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

crates/hir_ty/src/lib.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ pub fn make_canonical<T: HasInterner<Interner = Interner>>(
217217
pub struct CallableSig {
218218
params_and_return: Arc<[Ty]>,
219219
is_varargs: bool,
220-
legacy_const_generics_indices: Arc<[u32]>,
221220
}
222221

223222
has_interner!(CallableSig);
@@ -228,11 +227,7 @@ pub type PolyFnSig = Binders<CallableSig>;
228227
impl CallableSig {
229228
pub fn from_params_and_return(mut params: Vec<Ty>, ret: Ty, is_varargs: bool) -> CallableSig {
230229
params.push(ret);
231-
CallableSig {
232-
params_and_return: params.into(),
233-
is_varargs,
234-
legacy_const_generics_indices: Arc::new([]),
235-
}
230+
CallableSig { params_and_return: params.into(), is_varargs }
236231
}
237232

238233
pub fn from_fn_ptr(fn_ptr: &FnPointer) -> CallableSig {
@@ -249,14 +244,9 @@ impl CallableSig {
249244
.map(|arg| arg.assert_ty_ref(Interner).clone())
250245
.collect(),
251246
is_varargs: fn_ptr.sig.variadic,
252-
legacy_const_generics_indices: Arc::new([]),
253247
}
254248
}
255249

256-
pub fn set_legacy_const_generics_indices(&mut self, indices: &[u32]) {
257-
self.legacy_const_generics_indices = indices.into();
258-
}
259-
260250
pub fn to_fn_ptr(&self) -> FnPointer {
261251
FnPointer {
262252
num_binders: 0,
@@ -287,11 +277,7 @@ impl Fold<Interner> for CallableSig {
287277
) -> Result<Self::Result, E> {
288278
let vec = self.params_and_return.to_vec();
289279
let folded = vec.fold_with(folder, outer_binder)?;
290-
Ok(CallableSig {
291-
params_and_return: folded.into(),
292-
is_varargs: self.is_varargs,
293-
legacy_const_generics_indices: self.legacy_const_generics_indices,
294-
})
280+
Ok(CallableSig { params_and_return: folded.into(), is_varargs: self.is_varargs })
295281
}
296282
}
297283

crates/hir_ty/src/lower.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,10 +1364,7 @@ fn fn_sig_for_fn(db: &dyn HirDatabase, def: FunctionId) -> PolyFnSig {
13641364
.with_type_param_mode(ParamLoweringMode::Variable);
13651365
let ret = ctx_ret.lower_ty(&data.ret_type);
13661366
let generics = generics(db.upcast(), def.into());
1367-
let mut sig = CallableSig::from_params_and_return(params, ret, data.is_varargs());
1368-
if !data.legacy_const_generics_indices.is_empty() {
1369-
sig.set_legacy_const_generics_indices(&data.legacy_const_generics_indices);
1370-
}
1367+
let sig = CallableSig::from_params_and_return(params, ret, data.is_varargs());
13711368
make_binders(db, &generics, sig)
13721369
}
13731370

0 commit comments

Comments
 (0)