From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 6009D3870870; Tue, 21 Jun 2022 10:33:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6009D3870870 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Fix formatting error on 32-bits targets X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 44f2de02d478b5d3defa5f091ee6504fa5d2e2e6 X-Git-Newrev: 29f57496698d2098d48b9fff7807f22dadc10e6b Message-Id: <20220621103309.6009D3870870@sourceware.org> Date: Tue, 21 Jun 2022 10:33:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jun 2022 10:33:09 -0000 https://gcc.gnu.org/g:29f57496698d2098d48b9fff7807f22dadc10e6b commit 29f57496698d2098d48b9fff7807f22dadc10e6b Author: Marc Poulhiès Date: Sun Jun 12 16:44:07 2022 +0200 Fix formatting error on 32-bits targets Printing size_t as [unsigned] long (%ld or %lu) raises warnings on 32-bits targets. As the GCC pretty printer doesn't have the equivalent of libc's %z/%zu, fix all formats to use unsigned long and cast values. refs #1229 Signed-off-by: Marc Poulhiès Co-authored-by: Rainer Orth Diff: --- gcc/rust/expand/rust-macro-expand.cc | 6 ++-- gcc/rust/expand/rust-macro-substitute-ctx.cc | 7 +++-- gcc/rust/lex/rust-lex.cc | 2 +- gcc/rust/lint/rust-lint-marklive.cc | 4 +-- gcc/rust/rust-session-manager.cc | 4 +-- gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 11 ++++--- gcc/rust/typecheck/rust-tyty.cc | 37 ++++++++++++++--------- 7 files changed, 41 insertions(+), 30 deletions(-) diff --git a/gcc/rust/expand/rust-macro-expand.cc b/gcc/rust/expand/rust-macro-expand.cc index 6224b0c5e17..1219e11c7b4 100644 --- a/gcc/rust/expand/rust-macro-expand.cc +++ b/gcc/rust/expand/rust-macro-expand.cc @@ -707,10 +707,12 @@ MacroExpander::match_repetition (Parser &parser, rust_error_at (rep.get_match_locus (), "invalid amount of matches for macro invocation. Expected " "between %s and %s, got %lu", - lo_str.c_str (), hi_str.c_str (), match_amount); + lo_str.c_str (), hi_str.c_str (), + (unsigned long) match_amount); rust_debug_loc (rep.get_match_locus (), "%s matched %lu times", - res ? "successfully" : "unsuccessfully", match_amount); + res ? "successfully" : "unsuccessfully", + (unsigned long) match_amount); // We have to handle zero fragments differently: They will not have been // "matched" but they are still valid and should be inserted as a special diff --git a/gcc/rust/expand/rust-macro-substitute-ctx.cc b/gcc/rust/expand/rust-macro-substitute-ctx.cc index b7ab3abc0d9..6f16214a2d8 100644 --- a/gcc/rust/expand/rust-macro-substitute-ctx.cc +++ b/gcc/rust/expand/rust-macro-substitute-ctx.cc @@ -87,8 +87,9 @@ SubstituteCtx::check_repetition_amount (size_t pattern_start, rust_error_at ( frag_token->get_locus (), "different amount of matches used in merged " - "repetitions: expected %ld, got %ld", - expected_repetition_amount, repeat_amount); + "repetitions: expected %lu, got %lu", + (unsigned long) expected_repetition_amount, + (unsigned long) repeat_amount); is_valid = false; } } @@ -110,7 +111,7 @@ SubstituteCtx::substitute_repetition ( if (!check_repetition_amount (pattern_start, pattern_end, repeat_amount)) return {}; - rust_debug ("repetition amount to use: %lu", repeat_amount); + rust_debug ("repetition amount to use: %lu", (unsigned long) repeat_amount); std::vector> expanded; std::vector> new_macro; diff --git a/gcc/rust/lex/rust-lex.cc b/gcc/rust/lex/rust-lex.cc index 9e0595b02fb..13921e70b6c 100644 --- a/gcc/rust/lex/rust-lex.cc +++ b/gcc/rust/lex/rust-lex.cc @@ -1573,7 +1573,7 @@ Lexer::parse_partial_unicode_escape () rust_error_at (get_current_location (), "unicode escape should be between 1 and 6 hex " "characters; it is %lu", - num_str.length ()); + (unsigned long) num_str.length ()); // return false; return std::make_pair (Codepoint (0), additional_length_offset); } diff --git a/gcc/rust/lint/rust-lint-marklive.cc b/gcc/rust/lint/rust-lint-marklive.cc index 2b01abcc06c..f9850e80b31 100644 --- a/gcc/rust/lint/rust-lint-marklive.cc +++ b/gcc/rust/lint/rust-lint-marklive.cc @@ -235,8 +235,8 @@ MarkLive::visit (HIR::FieldAccessExpr &expr) if (index >= variant->num_fields ()) { rust_error_at (expr.get_receiver_expr ()->get_locus (), - "cannot access struct %s by index: %ld", - adt->get_name ().c_str (), index); + "cannot access struct %s by index: %lu", + adt->get_name ().c_str (), (unsigned long) index); return; } diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 57063753c24..3c429d47a96 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -98,8 +98,8 @@ validate_crate_name (const std::string &crate_name, Error &error) } if (crate_name.length () > kMaxNameLength) { - error = Error (Location (), "crate name cannot exceed %ld characters", - kMaxNameLength); + error = Error (Location (), "crate name cannot exceed %lu characters", + (unsigned long) kMaxNameLength); return false; } for (auto &c : crate_name) diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc index 1018f816ecb..df312af6dab 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc @@ -87,11 +87,12 @@ TypeCheckPattern::visit (HIR::TupleStructPattern &pattern) if (items_no_range.get_patterns ().size () != variant->num_fields ()) { - rust_error_at (pattern.get_locus (), - "this pattern has %lu fields but the corresponding " - "tuple variant has %lu field", - items_no_range.get_patterns ().size (), - variant->num_fields ()); + rust_error_at ( + pattern.get_locus (), + "this pattern has %lu fields but the corresponding " + "tuple variant has %lu field", + (unsigned long) items_no_range.get_patterns ().size (), + (unsigned long) variant->num_fields ()); // we continue on to try and setup the types as best we can for // type checking } diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index c509d9b845b..60407a70b15 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -678,7 +678,8 @@ SubstitutionRef::get_mappings_from_generic_args (HIR::GenericArgs &args) rust_error_at ( r, "generic item takes at most %lu type arguments but %lu were supplied", - substitutions.size (), args.get_type_args ().size ()); + (unsigned long) substitutions.size (), + (unsigned long) args.get_type_args ().size ()); return SubstitutionArgumentMappings::error (); } @@ -690,7 +691,8 @@ SubstitutionRef::get_mappings_from_generic_args (HIR::GenericArgs &args) rust_error_at ( r, "generic item takes at least %lu type arguments but %lu were supplied", - (min_required_substitutions () - offs), args.get_type_args ().size ()); + (unsigned long) (min_required_substitutions () - offs), + (unsigned long) args.get_type_args ().size ()); return SubstitutionArgumentMappings::error (); } @@ -3223,7 +3225,8 @@ TypeCheckCallExpr::visit (ADTType &type) { rust_error_at (call.get_locus (), "unexpected number of arguments %lu expected %lu", - call.num_params (), variant.num_fields ()); + (unsigned long) call.num_params (), + (unsigned long) variant.num_fields ()); return; } @@ -3254,8 +3257,8 @@ TypeCheckCallExpr::visit (ADTType &type) if (i != call.num_params ()) { rust_error_at (call.get_locus (), - "unexpected number of arguments %lu expected %lu", i, - call.num_params ()); + "unexpected number of arguments %lu expected %lu", + (unsigned long) i, (unsigned long) call.num_params ()); return; } @@ -3274,7 +3277,8 @@ TypeCheckCallExpr::visit (FnType &type) { rust_error_at (call.get_locus (), "unexpected number of arguments %lu expected %lu", - call.num_params (), type.num_params ()); + (unsigned long) call.num_params (), + (unsigned long) type.num_params ()); return; } } @@ -3282,7 +3286,8 @@ TypeCheckCallExpr::visit (FnType &type) { rust_error_at (call.get_locus (), "unexpected number of arguments %lu expected %lu", - call.num_params (), type.num_params ()); + (unsigned long) call.num_params (), + (unsigned long) type.num_params ()); return; } } @@ -3322,8 +3327,8 @@ TypeCheckCallExpr::visit (FnType &type) if (i < call.num_params ()) { rust_error_at (call.get_locus (), - "unexpected number of arguments %lu expected %lu", i, - call.num_params ()); + "unexpected number of arguments %lu expected %lu", + (unsigned long) i, (unsigned long) call.num_params ()); return; } @@ -3338,7 +3343,8 @@ TypeCheckCallExpr::visit (FnPtr &type) { rust_error_at (call.get_locus (), "unexpected number of arguments %lu expected %lu", - call.num_params (), type.num_params ()); + (unsigned long) call.num_params (), + (unsigned long) type.num_params ()); return; } @@ -3372,8 +3378,8 @@ TypeCheckCallExpr::visit (FnPtr &type) if (i != call.num_params ()) { rust_error_at (call.get_locus (), - "unexpected number of arguments %lu expected %lu", i, - call.num_params ()); + "unexpected number of arguments %lu expected %lu", + (unsigned long) i, (unsigned long) call.num_params ()); return; } @@ -3393,7 +3399,8 @@ TypeCheckMethodCallExpr::visit (FnType &type) { rust_error_at (call.get_locus (), "unexpected number of arguments %lu expected %lu", - call.num_params (), type.num_params ()); + (unsigned long) call.num_params (), + (unsigned long) type.num_params ()); return; } @@ -3427,8 +3434,8 @@ TypeCheckMethodCallExpr::visit (FnType &type) if (i != num_args_to_call) { rust_error_at (call.get_locus (), - "unexpected number of arguments %lu expected %lu", i, - call.num_params ()); + "unexpected number of arguments %lu expected %lu", + (unsigned long) i, (unsigned long) call.num_params ()); return; }