Skip to content

Commit affbc72

Browse files
committed
Modified to add 'found' to error message instead
1 parent 4872463 commit affbc72

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/librustc/middle/ty.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ use metadata::csearch;
4646
use middle;
4747
use middle::cast;
4848
use middle::check_const;
49-
use middle::const_eval::{self, ConstVal};
49+
use middle::const_eval::{self, ConstVal, ErrKind};
5050
use middle::def::{self, DefMap, ExportMap};
5151
use middle::dependency_format;
5252
use middle::fast_reject;
@@ -6182,11 +6182,13 @@ impl<'tcx> ctxt<'tcx> {
61826182
..
61836183
}) if segments.len() == 1 =>
61846184
format!("found variable"),
6185-
_ => format!("{}", err.description()),
6185+
_ => match err.kind {
6186+
ErrKind::MiscCatchAll => format!("but found {}", err.description()),
6187+
_ => format!("but {}", err.description())
6188+
}
61866189
};
61876190
span_err!(self.sess, count_expr.span, E0307,
6188-
"{}, expected constant integer for repeat count",
6189-
err_msg);
6191+
"expected constant integer for repeat count, {}", err_msg);
61906192
}
61916193
}
61926194
0

0 commit comments

Comments
 (0)