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

Correctly note item kind in NonConstFunctionCall error message #134701

Merged
merged 1 commit into from
Dec 24, 2024

Conversation

compiler-errors
Copy link
Member

Don't just call everything a "fn". This is more consistent with the error message we give for conditionally-const items, which do note the item's def kind.

r? fmease, this is a prerequisite for making those ~const PartialEq error messages better. Re-roll if you're busy or don't want to review this.

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 23, 2024

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@Urgau
Copy link
Member

Urgau commented Dec 23, 2024

make sense to me, r=me if you want (unless you want to wait for fmease of course)

@fmease
Copy link
Member

fmease commented Dec 23, 2024

@bors r=Urgau,fmease rollup

@bors
Copy link
Contributor

bors commented Dec 23, 2024

📌 Commit 92f93f6 has been approved by Urgau,fmease

It is now in the queue for this repository.

@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 Dec 23, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134638 (Fix effect predicates from item bounds in old solver)
 - rust-lang#134662 (Fix safety docs for `dyn Any + Send {+ Sync}`)
 - rust-lang#134689 (core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets)
 - rust-lang#134699 (Belay new reviews for workingjubilee)
 - rust-lang#134701 (Correctly note item kind in `NonConstFunctionCall` error message)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 772b95e into rust-lang:master Dec 24, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 24, 2024
Rollup merge of rust-lang#134701 - compiler-errors:non-const-def-descr, r=Urgau,fmease

Correctly note item kind in `NonConstFunctionCall` error message

Don't just call everything a "`fn`". This is more consistent with the error message we give for conditionally-const items, which do note the item's def kind.

r? fmease, this is a prerequisite for making those `~const PartialEq` error messages better. Re-roll if you're busy or don't want to review this.
@rustbot rustbot added this to the 1.85.0 milestone Dec 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants