Update check_unsafety.rs Change UnsafetyViolationKind::General to UnsafetyViolationKind::GeneralAndConstFn

[CloudNClock]

Reflect on #75340

Change UnsafetyViolationKind::General to UnsafetyViolationKind::GeneralAndConstFn

Due to my mistake, PR has been merged from #75578.

[rust-highfive]

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[RalfJung]

r? @oli-obk

[oli-obk]

Ah, didn't realize there was a PR. So, as mentioned in the issue, you need to bless the tests (and add a new test for the case in the issue). The fastest way to do that is ./x.py test --stage 1 --bless src/test/ui --test-args min_const_fn. That's a mouth full, but all of these flags actually do help:

• --stage 1 just builds a compiler and runs the tests, without first checking whether you can still build a compiler with that new compiler
• --bless updates .stderr files, you may still need to touch the source files (e.g. the //~ is unsafe comment in

  rust/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.rs

  Line 1 in c94ed5c

  const fn bad_const_fn_deref_raw(x: *mut usize) -> &'static usize { unsafe { &*x } } //~ is unsafe

  should now probably be removed)
• --test-args min_const_fn only runs tests with min_const_fn in their name

[CloudNClock]

1. Where should I put the test case from the issue?
   I added the new test case from the issue insrc/test/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs for now.
2. Do I import

#![feature(const_raw_ptr_deref)]
#![feature(raw_ref_macros)]
use std::ptr;

in the same file or other places?

Sorry, this is my first time getting into a big open source project. Thank you all for your explanations.

[oli-obk]

1. Where should I put the test case from the issue?
   I added the new test case from the issue in`src/test/ui/consts/min_const_fn/min_const_fn_unsafe_ok.rs` for now.

2. Do I import

#![feature(const_raw_ptr_deref)]
#![feature(raw_ref_macros)]
use std::ptr;

in the same file or other places?

While I personally am fine with the changes you made, I don't think the original driver behind min_const_fn_unsafe_ok.rs would be, so let's put it into a separate file in the same directory. Since the file will compile successfully, we'll need a // check-pass comment in that new file.

Sorry, this is my first time getting into a big open source project. Thank you all for your explanations.

No worries! These are all good questions, please never stop asking.

[CloudNClock]

What should I do now with all the commits? I try to squash the commits and then unexpected merge seems to be pushed. And previous commits are still shown. Did I do it in the wrong way? I think I should revert the merge?
If I commit, will the assignees receive a notification? Generally speaking, should I leave a comment after a stage of commits?
Thanks.

[RalfJung]

You already have a merge commit in here, so please rebase on top of latest origin/master while also squashing:

git fetch origin
git rebase --interactive origin/master

That should not create any merge commits. See for example this explanation of rebasing.

The reviewer will be notified when you do a regular push, but force-pushes unfortunately do not reliably trigger notifications (GitHub is acting rather strange there), so generally it is a good idea to ask the reviewer to have another look when the PR is ready again.

[oli-obk]

Jup, so the PR lgtm. While doing the rebase, please squash all commits into the first one