Skip to content

Change intrinsic declarations to new style - #132907

Merged
bors merged 3 commits into
rust-lang:masterfrom
aaishwarymishra:intrinsic
Nov 14, 2024
Merged

bors merged 3 commits into
rust-lang:masterfrom
aaishwarymishra:intrinsic

Conversation

@aaishwarymishra

@aaishwarymishra aaishwarymishra commented Nov 11, 2024 •

Copy link
Copy Markdown
Contributor

Pr is for issue #132735
This changes the first extern "rust-intrinsic" block to the new style.
r? @RalfJung

@rustbot

rustbot commented Nov 11, 2024

Copy link
Copy Markdown
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @RalfJung (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 11, 2024
@rustbot

rustbot commented Nov 11, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

Sorry if the changes looks a little messy , I have changed the first block or extern "intrinsic" to new delaration as its quite time consuming I wanted to confirm first if its fine. Then I can proceed with other blocks

@rust-log-analyzer

This comment has been minimized.

@RalfJung

RalfJung commented Nov 11, 2024 via email

Copy link
Copy Markdown
Member

Comment thread library/core/src/intrinsics/mod.rs Resolved
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@saethlin

Copy link
Copy Markdown
Member

I think the CI failures are because you deleted rustc_peek. I don't think it's called directly, but it seems required.

@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

yeah I guess I will git reset and begin again .

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 11, 2024
@rustbot

This comment has been minimized.

@compiler-errors

Copy link
Copy Markdown
Contributor

I would recommend removing the rustc_peek intrinsic, which is only used by tests, and instead redeclaring it in the test files that actually need it.

@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 12, 2024
@saethlin

Copy link
Copy Markdown
Member

GitHub doesn't let you reopen a PR once you've force-pushed to it. If you reset the branch to the commit before the force-push, I believe it will let you reopen it. (that commit would be ca3c94c)

@saethlin

Copy link
Copy Markdown
Member

? Was I wrong? That would be very cool if I was wrong.

@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

? Was I wrong? That would be very cool if I was wrong.

I just pushed new changes and reopened , git sometimes get confusing I forced pushed the latest commit of the main repo so there was no change in files so it closed.

I don't think force push closes the pr I have done it once before and pr was still open I am not sure though .

Anyways I have build the repo on my system and it showed no error I hope it does same here

@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

also I used x.py fmt Idk how it works but some function parameters are on different lines while others are in single line, kind of weird is it fine or I have to change that ?

@saethlin

Copy link
Copy Markdown
Member

Whatever x.py fmt does is what's going in. There's essentially no manual formatting in this repo, as is pretty typical in Rust.

@rust-log-analyzer

This comment has been minimized.

Comment thread library/core/src/intrinsics/mod.rs Resolved
@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

It looks like its fine now, sorry for trouble I will make sure it won't happen again.
Also should I make separate pr or other parts or add it in this as the changes will be very big

@RalfJung

Copy link
Copy Markdown
Member

Please wait until this PR landed before making the next one. :)

Which part of #132735 does this cover? Does it do all of intrinsics/mod.rs or just a part?

@aaishwarymishra

Copy link
Copy Markdown
Contributor Author

Please wait until this PR landed before making the next one. :)

Which part of #132735 does this cover? Does it do all of intrinsics/mod.rs or just a part?

I wasn't I was just asking also Its just a part I think there are 2 more extern "intrinsic" declaration on that file

@RalfJung

Copy link
Copy Markdown
Member

Okay, sounds good!

Someone should take a close look at the first part before you repeat the same process for the remaining intrinsics, so it's better to wait for now.

@RalfJung RalfJung changed the title Added new intrinsic declaration Change intrinsic declarations to new style Nov 12, 2024
@saethlin

Copy link
Copy Markdown
Member

It looks like its fine now, sorry for trouble I will make sure it won't happen again.

There's no need to apologize. Making mistakes is a normal part of development and review, that's why we have tests and reviewers.

Looks good!

r? saethlin
@bors r+ rollup=iffy

@bors

bors commented Nov 12, 2024

Copy link
Copy Markdown
Contributor

📌 Commit 29cfb35 has been approved by saethlin

It is now in the queue for this repository.

@rustbot rustbot assigned saethlin and unassigned RalfJung Nov 12, 2024
@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 Nov 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 14, 2024
…kingjubilee

Rollup of 7 pull requests

Successful merges:

 - rust-lang#131304 (float types: move copysign, abs, signum to libcore)
 - rust-lang#132907 (Change intrinsic declarations to new style)
 - rust-lang#132971 (Handle infer vars in anon consts on stable)
 - rust-lang#133003 (Make `CloneToUninit` dyn-compatible)
 - rust-lang#133004 (btree: simplify the backdoor between set and map)
 - rust-lang#133008 (update outdated comment about test-float-parse)
 - rust-lang#133012 (Add test cases for rust-lang#125918)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 55e05f2 into rust-lang:master Nov 14, 2024
@rustbot rustbot added this to the 1.84.0 milestone Nov 14, 2024
@aaishwarymishra

ghost commented Nov 14, 2024

Copy link
Copy Markdown
Contributor Author

Oh sorry for late response I was busy with my college , so like this pr is merged so I have to make separate pr for other parts for changes right?

@RalfJung

ghost commented Nov 14, 2024

Copy link
Copy Markdown
Member

You don't have to, but if you want to continue working on it that would be the next step. :)

@aaishwarymishra
aaishwarymishra deleted the intrinsic branch November 14, 2024 13:39
@aaishwarymishra
aaishwarymishra restored the intrinsic branch November 14, 2024 13:54
@aaishwarymishra
aaishwarymishra deleted the intrinsic branch November 14, 2024 14:18
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. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants