From 6d42548da9c3b7c3dc46e88c585484314bb55faf Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 5 Apr 2022 17:41:22 -0600 Subject: [PATCH 1/2] rust-session-manager: fix an issue where ... ... the -frust-crate= option got incorrectly overridden by a default value Signed-off-by: Zixing Liu --- gcc/rust/rust-session-manager.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 96d94b2fbb2..f3010aa914e 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -311,8 +311,9 @@ Session::init () // setup backend to GCC GIMPLE backend = rust_get_backend (); - // set the default crate name - options.set_crate_name (kDefaultCrateName); + // set the default crate name if crate name was unset + if (options.crate_name.empty ()) + options.set_crate_name (kDefaultCrateName); } /* Initialise default options. Actually called before handle_option, unlike init From af14ad605680116d6e93c73ae1c0aba5bd5e7460 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 5 Apr 2022 17:42:37 -0600 Subject: [PATCH 2/2] rust-ast-full-test: fix a minor typo Signed-off-by: Zixing Liu --- gcc/rust/ast/rust-ast-full-test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/rust/ast/rust-ast-full-test.cc b/gcc/rust/ast/rust-ast-full-test.cc index d15c09cfa2d..d58017731ee 100644 --- a/gcc/rust/ast/rust-ast-full-test.cc +++ b/gcc/rust/ast/rust-ast-full-test.cc @@ -311,7 +311,7 @@ Visibility::as_string () const case NONE: return std::string ("pub"); case CRATE: - return std::string ("ub(crate)"); + return std::string ("pub(crate)"); case SELF: return std::string ("pub(self)"); case SUPER: