diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-30 09:35:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 09:35:11 +0000 |
| commit | 1738bb8c76c499fdec244cea3d746db9438f8a11 (patch) | |
| tree | e35d33c57162f0ac8940c22a4894983c770eaf84 /gcc | |
| parent | 2d11bfd88c112cecd06243c6525f4b671574be7c (diff) | |
| parent | ce5aab47afcafced3d5b5de326bdfeaa88b9c5cd (diff) | |
| download | gcc-1738bb8c76c499fdec244cea3d746db9438f8a11.zip gcc-1738bb8c76c499fdec244cea3d746db9438f8a11.tar.gz gcc-1738bb8c76c499fdec244cea3d746db9438f8a11.tar.bz2 | |
Merge #537
537: Minor warning cleanup r=philberty a=dkm
Pushing 2 commit for Mark, cleaning up some warning.
Co-authored-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-expr.h | 1 | ||||
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-type.h | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.h b/gcc/rust/typecheck/rust-hir-type-check-expr.h index e06b10d..327a9a0 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.h +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.h @@ -1121,7 +1121,6 @@ private: for (size_t i = 0; i < expr.get_num_segments (); i++) { HIR::PathExprSegment &seg = expr.get_segments ().at (i); - bool have_more_segments = i < expr.get_num_segments (); bool is_root = *offset == 0; NodeId ast_node_id = seg.get_mappings ().get_nodeid (); diff --git a/gcc/rust/typecheck/rust-hir-type-check-type.h b/gcc/rust/typecheck/rust-hir-type-check-type.h index b4baccf..6081ec5 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-type.h +++ b/gcc/rust/typecheck/rust-hir-type-check-type.h @@ -255,11 +255,9 @@ public: void visit (HIR::TypeParam ¶m) override { - TyTy::BaseType *default_ty_param = nullptr; if (param.has_type ()) - { - default_ty_param = TypeCheckType::Resolve (param.get_type ().get ()); - } + TypeCheckType::Resolve (param.get_type ().get ()); + resolved = new TyTy::ParamType (param.get_type_representation (), param.get_mappings ().get_hirid (), param); } |