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

core: move intrinsics.rs into intrinsics folder #132639

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 5, 2024

This makes the rustbot notification we have set up for this folder in triagebot.toml actually work. Also IMO it makes more sense to have it all in one folder.

@rustbot
Copy link
Collaborator

rustbot commented Nov 5, 2024

r? @workingjubilee

rustbot has assigned @workingjubilee.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 5, 2024

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

cc @rust-lang/miri

@rust-log-analyzer

This comment has been minimized.

@ChrisDenton
Copy link
Member

This feels like a limitation of triagebot that should ideally be addressed.

@lqd
Copy link
Member

lqd commented Nov 5, 2024

Wouldn't a [mentions."library/core/src/intrinsics.rs"] work here?

@RalfJung
Copy link
Member Author

RalfJung commented Nov 5, 2024 via email

@workingjubilee
Copy link
Member

oh boy, is it time for the annual slapfight between "people who navigate Rust modules from the module names first" and "people who navigate Rust modules via the folders first"?

@ChrisDenton
Copy link
Member

To be clear, I have no preference but I do have a mild dislike for churn. Anyway, I'll leave it up to the reviewer.

@workingjubilee
Copy link
Member

workingjubilee commented Nov 5, 2024

I mean, I obviously can't say "churn bad" given my history123. :^)

Footnotes

  1. https://github.com/rust-lang/rust/pull/132574

  2. https://github.com/rust-lang/rust/pull/132385

  3. https://github.com/rust-lang/rust/pull/132246

@bors
Copy link
Contributor

bors commented Nov 6, 2024

☔ The latest upstream changes (presumably #132661) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

RalfJung commented Nov 6, 2024

@rust-lang/libs in the end this is up to you. :)

@Amanieu
Copy link
Member

Amanieu commented Nov 6, 2024

While I personally prefer the mod.rs style, here I would prefer staying consistent with the code style of the rest of the standard library and instead fixing triagebot.

@RalfJung
Copy link
Member Author

RalfJung commented Nov 6, 2024

The standard library has 193 mod.rs files (find library/ -name mod.rs). libcore alone has 31 (find library/core/src -name mod.rs). So in which sense does this PR make things not consistent with the existing code style?

@Amanieu
Copy link
Member

Amanieu commented Nov 6, 2024

The standard library also has 457 directories which indicates that the prevailing style is to not use mod.rs. Anyways, I don't feel too strongly about this so r=me unless someone else feels strongly about it.

@RalfJung
Copy link
Member Author

RalfJung commented Nov 7, 2024

FWIW for modules which only contain a "tests" file, the module_name.rs style makes a lot of sense IMO. And AFAIK no explicit decision for either style has been made by the team, so we shouldn't read too much into a a 2/3 majority. Clearly both styles are popular.

@workingjubilee
Copy link
Member

workingjubilee commented Nov 7, 2024

I

  1. prefer fixing triagebot with or without this PR, tbh
  2. prefer not deciding the matter on a simple "vote" or "exit poll"
  3. ...truly, please, do not invite me to discuss the tyranny of the majority for the next while, I will struggle to restrain myself
  4. am happy to acknowledge RalfJung's interest (more generally, wg-const-eval's interest) and thus organize this directory in a way that strikes them as convenient

considering the first and last items, I most prefer to r+ this if someone first opens an issue on the triagebot repo that it might be nice if the triagebot syntax worked for this case "automatically".

@RalfJung
Copy link
Member Author

RalfJung commented Nov 7, 2024

Triagebot is configured in terms of files and folders, not Rust modules. IMO it'd be strange if it worked any differently. So I've formulated the issue in a more open-ended way: rust-lang/triagebot#1855.

@workingjubilee
Copy link
Member

workingjubilee commented Nov 7, 2024

Triagebot is configured in terms of files and folders, not Rust modules. IMO it'd be strange if it worked any differently. So I've formulated the issue in a more open-ended way: rust-lang/triagebot#1855

Yes, I was struggling to phrase the "automatically" there as I was considering it. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants