diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-04-06 11:00:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-06 11:00:42 +0000 |
| commit | 779de323f3cc5cf2bb43050b135fbbeb3b3716cb (patch) | |
| tree | f5db0c15ebcd8f104308613ceaabd4123164b97b /gcc/rust | |
| parent | 9011184f38a04f81ba3194b826bec3f30a11c07b (diff) | |
| parent | af14ad605680116d6e93c73ae1c0aba5bd5e7460 (diff) | |
| download | gcc-779de323f3cc5cf2bb43050b135fbbeb3b3716cb.zip gcc-779de323f3cc5cf2bb43050b135fbbeb3b3716cb.tar.gz gcc-779de323f3cc5cf2bb43050b135fbbeb3b3716cb.tar.bz2 | |
Merge #1083
1083: bugfix: fix several minor issues r=CohenArthur a=liushuyu
- Fixed `-frust-crate= option` got incorrectly overridden by a default value (`example`)
- Fix a minor typo in `gcc/rust/ast/rust-ast-full-test.cc`
Co-authored-by: liushuyu <liushuyu011@gmail.com>
Diffstat (limited to 'gcc/rust')
| -rw-r--r-- | gcc/rust/ast/rust-ast-full-test.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/rust-session-manager.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gcc/rust/ast/rust-ast-full-test.cc b/gcc/rust/ast/rust-ast-full-test.cc index d15c09c..d580177 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: diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 96d94b2..f3010aa 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 |