From 0a99bfe15af01e15c07bb5003b54d351f64a5cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= Date: Sat, 16 Sep 2023 23:31:34 +0200 Subject: gccrs: Minor typo fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix varadic -> variadic gcc/rust/ChangeLog: * backend/rust-compile-expr.cc (CompileExpr::visit): Fix typo in varIadic. * backend/rust-compile-type.cc (TyTyResolveCompile::visit): Likewise. * rust-backend.h (function_type_varadic): Rename into ... (function_type_variadic): ... this. * rust-gcc.cc (function_type_varadic): Rename into ... (function_type_variadic): ... this. * typecheck/rust-tyty-call.cc (TypeCheckCallExpr::visit): Likewise. * typecheck/rust-tyty.h (is_varadic): Renamed into ... (is_variadic): ... this. Signed-off-by: Marc Poulhiès --- gcc/rust/backend/rust-compile-expr.cc | 6 +++--- gcc/rust/backend/rust-compile-type.cc | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'gcc/rust/backend') diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc index 2c8ed02..b827f4c 100644 --- a/gcc/rust/backend/rust-compile-expr.cc +++ b/gcc/rust/backend/rust-compile-expr.cc @@ -1634,11 +1634,11 @@ CompileExpr::visit (HIR::CallExpr &expr) if (possible_trait_call) return; - bool is_varadic = false; + bool is_variadic = false; if (tyty->get_kind () == TyTy::TypeKind::FNDEF) { const TyTy::FnType *fn = static_cast (tyty); - is_varadic = fn->is_varadic (); + is_variadic = fn->is_variadic (); } size_t required_num_args = expr.get_arguments ().size (); @@ -1659,7 +1659,7 @@ CompileExpr::visit (HIR::CallExpr &expr) auto &argument = expr.get_arguments ().at (i); auto rvalue = CompileExpr::Compile (argument.get (), ctx); - if (is_varadic && i >= required_num_args) + if (is_variadic && i >= required_num_args) { args.push_back (rvalue); continue; diff --git a/gcc/rust/backend/rust-compile-type.cc b/gcc/rust/backend/rust-compile-type.cc index 0c47102..8368fce 100644 --- a/gcc/rust/backend/rust-compile-type.cc +++ b/gcc/rust/backend/rust-compile-type.cc @@ -218,12 +218,13 @@ TyTyResolveCompile::visit (const TyTy::FnType &type) parameters.push_back (compiled_param); } - if (!type.is_varadic ()) + if (!type.is_variadic ()) translated = Backend::function_type (receiver, parameters, results, NULL, type.get_ident ().locus); else - translated = Backend::function_type_varadic (receiver, parameters, results, - NULL, type.get_ident ().locus); + translated + = Backend::function_type_variadic (receiver, parameters, results, NULL, + type.get_ident ().locus); } void -- cgit v1.1