Skip to content

Commit 193b748

Browse files
committed
Remove FixedArraySize error
1 parent d5c6cb8 commit 193b748

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

src/librustc/infer/opaque_types/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
284284
debug!("constrain_opaque_type: def_id={:?}", def_id);
285285
debug!("constrain_opaque_type: opaque_defn={:#?}", opaque_defn);
286286

287+
let tcx = self.tcx;
288+
287289
let concrete_ty = self.resolve_vars_if_possible(&opaque_defn.concrete_ty);
288290

289291
debug!("constrain_opaque_type: concrete_ty={:?}", concrete_ty);

src/librustc/ty/error.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ pub enum TypeError<'tcx> {
2323
AbiMismatch(ExpectedFound<abi::Abi>),
2424
Mutability,
2525
TupleSize(ExpectedFound<usize>),
26-
FixedArraySize(ExpectedFound<u64>),
2726
ArgCount,
2827

2928
RegionsDoesNotOutlive(Region<'tcx>, Region<'tcx>),
@@ -94,12 +93,6 @@ impl<'tcx> fmt::Display for TypeError<'tcx> {
9493
values.found)
9594
}
9695
Mutability => write!(f, "types differ in mutability"),
97-
FixedArraySize(values) => {
98-
write!(f, "expected an array with a fixed size of {} elements, \
99-
found one with {} elements",
100-
values.expected,
101-
values.found)
102-
}
10396
TupleSize(values) => {
10497
write!(f, "expected a tuple with {} elements, \
10598
found one with {} elements",

src/librustc/ty/structural_impls.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,6 @@ impl<'a, 'tcx> Lift<'tcx> for ty::error::TypeError<'a> {
716716
AbiMismatch(x) => AbiMismatch(x),
717717
Mutability => Mutability,
718718
TupleSize(x) => TupleSize(x),
719-
FixedArraySize(x) => FixedArraySize(x),
720719
ArgCount => ArgCount,
721720
RegionsDoesNotOutlive(a, b) => {
722721
return tcx.lift(&(a, b)).map(|(a, b)| RegionsDoesNotOutlive(a, b))
@@ -1295,7 +1294,6 @@ EnumTypeFoldableImpl! {
12951294
(ty::error::TypeError::AbiMismatch)(x),
12961295
(ty::error::TypeError::Mutability),
12971296
(ty::error::TypeError::TupleSize)(x),
1298-
(ty::error::TypeError::FixedArraySize)(x),
12991297
(ty::error::TypeError::ArgCount),
13001298
(ty::error::TypeError::RegionsDoesNotOutlive)(a, b),
13011299
(ty::error::TypeError::RegionsInsufficientlyPolymorphic)(a, b),

0 commit comments

Comments
 (0)