bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #98305 - klensy:no-err-alloc, r=compiler-errors

Browse source 
prohibit_generics: don't alloc error string if no error emitted

Noticed unreaded allocs in DHAT.
This commit is contained in:
Michael Goulet 2022-06-23 14:39:09 -07:00 • committed by GitHub
commit 0ed2feca61
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_typeck/src/astconv/mod.rs
View file

@ -2111,6 +2111,16 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
extend: impl Fn(&mut DiagnosticBuilder<'tcx, ErrorGuaranteed>), extend: impl Fn(&mut DiagnosticBuilder<'tcx, ErrorGuaranteed>),
) -> bool { ) -> bool {
let args = segments.clone().flat_map(|segment| segment.args().args); let args = segments.clone().flat_map(|segment| segment.args().args);
let (lt, ty, ct, inf) =
args.clone().fold((false, false, false, false), |(lt, ty, ct, inf), arg| match arg {
hir::GenericArg::Lifetime(_) => (true, ty, ct, inf),
hir::GenericArg::Type(_) => (lt, true, ct, inf),
hir::GenericArg::Const(_) => (lt, ty, true, inf),
hir::GenericArg::Infer(_) => (lt, ty, ct, true),
});
let mut emitted = false;
if lt || ty || ct || inf {
let types_and_spans: Vec<_> = segments let types_and_spans: Vec<_> = segments
.clone() .clone()
.flat_map(|segment| { .flat_map(|segment| {
@ -2147,15 +2157,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
[] => "this type".to_string(), [] => "this type".to_string(),
}; };
let (lt, ty, ct, inf) =
args.clone().fold((false, false, false, false), |(lt, ty, ct, inf), arg| match arg {
hir::GenericArg::Lifetime(_) => (true, ty, ct, inf),
hir::GenericArg::Type(_) => (lt, true, ct, inf),
hir::GenericArg::Const(_) => (lt, ty, true, inf),
hir::GenericArg::Infer(_) => (lt, ty, ct, true),
});
let mut emitted = false;
if lt || ty || ct || inf {
let arg_spans: Vec<Span> = args.map(|arg| arg.span()).collect(); let arg_spans: Vec<Span> = args.map(|arg| arg.span()).collect();
let mut kinds = Vec::with_capacity(4); let mut kinds = Vec::with_capacity(4);