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.

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

Add thiscall_abi to stable version Rust 1.73. #2661

Merged
merged 2 commits into from
Jan 13, 2024

Conversation

rodrigorc
Copy link
Contributor

1.73 Changelog:

Stabilization issue:


Maybe there are some tests to be fixed. I'm not quite sure how to review those.

@pvdrz
Copy link
Contributor

pvdrz commented Oct 17, 2023

@rodrigorc
Copy link
Contributor Author

Added a test case, copied from the nightly but with stable 1.73 instead.

BTW, a bit off-topic, the test-one.sh script does not apply the --target option chosen from the header file. That took me some time to notice...

@rodrigorc
Copy link
Contributor Author

It looks like there was some test that failed. I think that is because they are not obeying the --target option, thiscall exists only in i686-pc-windows-* targets, I think.

The win32-thiscall_nightly test doesn't fail because the .rs file contains this line:

#![cfg(feature = "nightly")]

So if you use a non-nightly compiler, it will just skip the whole file and trivially succeed!

I guess I could do a similar thing in my new .rs file: #![cfg(target = "i686-pc-windows-msvc")] or something, but it looks a bit like cheating.

@rodrigorc
Copy link
Contributor Author

Hi @pvdrz ! Any feedback about this PR?

Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

Seems we need a CI fix and rebase, but looks good.

@tgross35
Copy link
Contributor

@rodrigorc can you fix the macos CI test?

@rodrigorc
Copy link
Contributor Author

@rodrigorc can you fix the macos CI test?

I just force-pushed a fix for that. I'm not totally sure if that is the proper solution, but I run it changing some things here and there and it looked mostly ok, but I don't have a macos, so I can't be sure about that part.

@emilio emilio merged commit 2ded089 into rust-lang:main Jan 13, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants