Suggest fn if fun, func, function or def is used to define a function

[bindsdev]

Closes #99751

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (or someone else) soon.

Please see the contribution instructions for more information.

[rustbot]

The Miri submodule was changed

cc @rust-lang/miri

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[bindsdev]

@lcnr: According to the CI failure message, and a couple bot messages above, it seems like I somehow modified miri. To make the CI pass and hopefully unblock the merge, what would I do to prevent the CI from failing?

[lcnr]

you've committed a submodule change. I don't know enough about git to give you the best way to do it, but it should be easiest to use git reset HEAD~1 to undo your commit and then add all files while being careful to not readd the change to the miri submodule.

If you're still stuck I suggest asking for help with this in #compiler/help on zulip

[lcnr]

please merge your commits, this can be done using

git rebase HEAD~4 -i

and then changing pick for all but the first commit to fixup or just f.

I don't know this code enough to tell whether this would also emit this suggestion at places where it doesn't make sense, so

r? rust-lang/compiler

[davidtwco]

This looks good, left one comment, but you'll need to remove the merge commits and reverts and things like that, for this change, you should have only one commit with the changes you're making (if you end up with conflicts, rebase instead of merging).

[davidtwco]

This still isn't right. I'd suggest just deleting your branch locally, creating a new identically-named branch from master, applying your change again, commiting and force-pushing. That's probably going to be easier.

[bindsdev]

@davidtwco was that supposed to happen? I have never done a force push before and something feels wrong.

[davidtwco]

@davidtwco was that supposed to happen? I have never done a force push before and something feels wrong.

I think it's just that you force pushed master to your branch, rather than master plus additional changes, and that made GitHub think it was merged.

[bindsdev]

@davidtwco was that supposed to happen? I have never done a force push before and something feels wrong.

I think it's just that you force pushed master to your branch, rather than master plus additional changes, and that made GitHub think it was merged.

I see. It seems like no changes were recorded also. So what shall I do now?

[davidtwco]

I see. It seems like no changes were recorded also. So what shall I do now?

I think you should be able to make the changes for this fix and then commit and push it.

[bindsdev]

I see. It seems like no changes were recorded also. So what shall I do now?

I think you should be able to make the changes for this fix and then commit and push it.

Will I have to make another PR?

[davidtwco]

I don't think so, if you add changes this should re-open, but there's no harm in another PR if that's easier too.

[bindsdev]

I don't think so, if you add changes this should re-open, but there's no harm in another PR if that's easier too.

I pushed the changes about 14 hours ago. Seems like it wasn't reopened.

[davidtwco]

I don't think so, if you add changes this should re-open, but there's no harm in another PR if that's easier too.

I pushed the changes about 14 hours ago. Seems like it wasn't reopened.

Feel free to open a new PR then, and include r? @davidtwco (outside of a code block) in the description so that I'm assigned.