Skip to content

The name of NativeLib will be presented - #109243

Merged
bors merged 2 commits into
rust-lang:masterfrom
chenyukang:yukang/fix-ice-109144
Mar 19, 2023
Merged

The name of NativeLib will be presented#109243
bors merged 2 commits into
rust-lang:masterfrom
chenyukang:yukang/fix-ice-109144

Conversation

@chenyukang

@chenyukangchenyukang commented Mar 17, 2023

Copy link
Copy Markdown
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

rustbot commented Mar 17, 2023

Copy link
Copy Markdown
Collaborator

r? @cjgillot

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

@rustbotrustbot 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
@petrochenkovpetrochenkov self-assigned this Mar 17, 2023
@petrochenkov

petrochenkov commented Mar 17, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

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

petrochenkov commented Mar 17, 2023

Copy link
Copy Markdown
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

@rustbotrustbot 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
chenyukangforce-pushed the yukang/fix-ice-109144 branch from e3e0d87 to 2dda1bbCompareMarch 18, 2023 06:45
@chenyukang

chenyukang commented Mar 18, 2023

Copy link
Copy Markdown
MemberAuthor

@rustbot ready

@rustbotrustbot 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
Comment threadtests/ui/linkage-attr/link-attr-validation-late.rs Outdated
Comment threadcompiler/rustc_metadata/src/native_libs.rs Outdated
Comment threadcompiler/rustc_metadata/src/native_libs.rs Outdated
Comment threadcompiler/rustc_metadata/src/native_libs.rs Outdated
Comment threadcompiler/rustc_metadata/src/native_libs.rs Outdated

@petrochenkovpetrochenkovMar 18, 2023

Copy link
Copy Markdown
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.

@petrochenkovpetrochenkov 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

petrochenkov commented Mar 18, 2023

Copy link
Copy Markdown
Contributor

r=me after squashing commits

@chenyukang
chenyukangforce-pushed the yukang/fix-ice-109144 branch from 0c1ce26 to d5558e6CompareMarch 19, 2023 03:23
@chenyukang

chenyukang commented Mar 19, 2023

Copy link
Copy Markdown
MemberAuthor

@bors r=petrochenkov

@bors

bors commented Mar 19, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit d5558e6 has been approved by petrochenkov

It is now in the queue for this repository.

@borsbors 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-DPCDylan-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 ofrust-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:masterMar 19, 2023
@rustbotrustbot added this to the 1.70.0 milestone Mar 19, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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