Skip to content

Conversation

davidtwco
Copy link
Member

This changes a mistake introduced in #61195 where the mangling
workaround used was incorrect, resolving this comment from @eddyb.

r? @eddyb

This changes a mistake introduced in rust-lang#61195 where the mangling
workaround used was incorrect.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2019
@eddyb
Copy link
Member

eddyb commented Jun 1, 2019

cc @alexcrichton looks like the $u...$ demangler (for the legacy mangling) has a few special-cases and doesn't do arbitrary characters, would you mind if I added support for that, later?

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 1, 2019

📌 Commit e71f466 has been approved by eddyb

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 2, 2019
…r=eddyb

codegen: change `$6d$` to `$u6d$`

This changes a mistake introduced in rust-lang#61195 where the mangling
workaround used was incorrect, resolving [this comment](rust-lang#61195 (comment)) from @eddyb.

r? @eddyb
bors added a commit that referenced this pull request Jun 2, 2019
Rollup of 6 pull requests

Successful merges:

 - #61380 (Fix some issues with `unwrap_usize` instead of `assert_usize`)
 - #61423 (codegen: change `$6d$` to `$u6d$`)
 - #61438 (Point at individual type args on arg count mismatch)
 - #61441 (Tweak wording when encountering `fn` call in pattern)
 - #61451 (Fix missing semicolon in doc)
 - #61458 (Fix typo in AsRef doc)

Failed merges:

r? @ghost
@bors bors merged commit e71f466 into rust-lang:master Jun 2, 2019
@davidtwco davidtwco deleted the correct-symbol-mangling branch June 3, 2019 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants