Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

The name of NativeLib will be presented #109243

Merged
merged 2 commits into from
Mar 19, 2023
Merged

The name of NativeLib will be presented #109243

merged 2 commits into from
Mar 19, 2023

Conversation

chenyukang
Copy link
Member

Fixes #109144

I was working on a quick fix, but found change the name from Option<Symbol> to Symbol make life a little bit easier.

@rustbot
Copy link
Collaborator

rustbot commented Mar 17, 2023

r? @cjgillot

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 17, 2023
@petrochenkov petrochenkov self-assigned this Mar 17, 2023
@petrochenkov
Copy link
Contributor

petrochenkov commented Mar 17, 2023 •
edited
Loading

change the name from Option<Symbol> to Symbol make life a little bit easier

The name of library is legitimately None in the wasm_import_module case.

@petrochenkov
Copy link
Contributor

I think NativeLib::wasm_import_module could be merged into NativeLib::name to avoid the Option, but then you'd need to add a new NativeLibKind for wasm import modules.

r? @petrochenkov
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 17, 2023
@chenyukang
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 18, 2023
petrochenkov
petrochenkov reviewed Mar 18, 2023
View reviewed changes
tests/ui/linkage-attr/link-attr-validation-late.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs Outdated Show resolved Hide resolved
compiler/rustc_metadata/src/native_libs.rs
}
lib.verbatim = passed_lib.verbatim;
return true;
if lib.name.as_str() == passed_lib.name {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a behavior change - wasm_import_modules can now be overridden from command line, but that's probably fine.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2023
@petrochenkov
Copy link
Contributor

r=me after squashing commits

@chenyukang
Copy link
Member Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Mar 19, 2023

📌 Commit d5558e6 has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 19, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 19, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 19, 2023
@bors
Auto merge of rust-lang#109346 - Dylan-DPC:rollup-vszi5bn, r=Dylan-DPC
8826b68 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#104100 (Allow using `Range` as an `Iterator` in const contexts. )
 - rust-lang#105793 (Add note for mismatched types because of circular dependencies)
 - rust-lang#108798 (move default backtrace setting to sys)
 - rust-lang#108829 (Use Edition 2021 :pat in matches macro)
 - rust-lang#108973 (Beautify pin! docs)
 - rust-lang#109003 (Add `useless_anonymous_reexport` lint)
 - rust-lang#109022 (read_buf_exact: on error, all read bytes are appended to the buffer)
 - rust-lang#109212 (fix: don't suggest similar method when unstable)
 - rust-lang#109243 (The name of NativeLib will be presented)
 - rust-lang#109324 (Implement FixedSizeEncoding for UnusedGenericParams.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1f0fcf1 into rust-lang:master Mar 19, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.

ICE: Option::unwrap() on a None value', compiler/rustc_metadata/src/native_libs.rs:61:48
5 participants
@chenyukang @rustbot @petrochenkov @bors @cjgillot