diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-03-30 11:14:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 11:14:40 +0000 |
| commit | bd1f435b2310e61ed76d69063004c2aadb496255 (patch) | |
| tree | 27321b25416636f9ab6516a417d43c824861c13a /gcc | |
| parent | e8b9587d3a0615f497cfe9c66995c1f21e42a536 (diff) | |
| parent | e824a0835b1514d39287da3fe53dc9e11a0c5f42 (diff) | |
| download | gcc-bd1f435b2310e61ed76d69063004c2aadb496255.zip gcc-bd1f435b2310e61ed76d69063004c2aadb496255.tar.gz gcc-bd1f435b2310e61ed76d69063004c2aadb496255.tar.bz2 | |
Merge #1059
1059: Add base for build job using older GCC version r=CohenArthur a=CohenArthur
Fixes #1058
Co-authored-by: Arthur Cohen <arthur.cohen@embecosm.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-path-probe.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/rust/typecheck/rust-hir-path-probe.h b/gcc/rust/typecheck/rust-hir-path-probe.h index 50d660c..3c1858c 100644 --- a/gcc/rust/typecheck/rust-hir-path-probe.h +++ b/gcc/rust/typecheck/rust-hir-path-probe.h @@ -364,10 +364,9 @@ protected: PathProbeCandidate::TraitItemCandidate trait_item_candidate{trait_ref, trait_item_ref, impl}; - PathProbeCandidate candidate{candidate_type, - trait_item_tyty, - trait_ref->get_locus (), - {trait_item_candidate}}; + + PathProbeCandidate candidate{candidate_type, trait_item_tyty, + trait_ref->get_locus (), trait_item_candidate}; candidates.push_back (std::move (candidate)); } @@ -409,10 +408,9 @@ protected: PathProbeCandidate::TraitItemCandidate trait_item_candidate{trait_ref, trait_item_ref, nullptr}; - PathProbeCandidate candidate{candidate_type, - trait_item_tyty, + PathProbeCandidate candidate{candidate_type, trait_item_tyty, trait_item_ref->get_locus (), - {trait_item_candidate}}; + trait_item_candidate}; candidates.push_back (std::move (candidate)); } |