Improve diagnostic for const ctors in array repeat expressions #113925

clubby789 · 2023-07-21T16:02:03Z

rustbot · 2023-07-21T16:02:08Z

(rustbot has picked a reviewer for you, use r? to override)

compiler/rustc_middle/src/traits/mod.rs

estebank · 2023-07-24T11:56:14Z

compiler/rustc_middle/src/traits/mod.rs

+/// Whether a value can be extracted into a const.
+/// Used for diagnostics around array repeat expressions.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]
+pub enum IsConstable {


compiler/rustc_hir_typeck/src/expr.rs

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

clubby789 · 2023-07-24T17:20:45Z

Updated to be a structured suggestion, but I'm not sure about the placement of it (the line before the span of the expression being repeated), since the line before could be part of some other expression. It probably doesn't matter oto much since this is a HasPlaceholders suggestion

estebank

Oh wow! Thank you for attempting to turn this into a structured suggestion in this same PR, was expecting it to be addressed as follow up work :)

I think we can make this very robust, by changing RepeatElementCopy to carry more info.

compiler/rustc_hir_typeck/src/expr.rs

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

clubby789 · 2023-07-24T19:35:25Z

While working on this, it looks like we get weird highlighting when the span we're suggesting gets moved to a newline. Putting the const after works okay but results in weirder looking code

estebank · 2023-07-24T19:45:11Z

The highlighting is likely a bug in the suggestion calculation. What you could do instead is use span_extend_to_line (and check that there's no code before it (like if we had the span for bar() in foo(); bar();) and insert the whole line to side step the issue (but ideally we should fix the underlying problem, fixing the coloring, at some point).

In any case, try to get the ascii output itself to look ok and rustfix suggestions to apply neatly, and we can deal with the coloring separately.

Edit: could it be that there's a tab or some other whitespace hidden in there? I could imagine inconsistent handling of \t in this part of the snippet machinery.

clubby789 · 2023-07-24T20:02:44Z

Ah, looks like it's a bug with indentation. Fixing the indentation makes the highlighting work properly

clubby789 · 2023-07-24T20:07:35Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+                    err.multipart_suggestion(help_msg, vec![
+                        (elt_stmt_span.shrink_to_lo(), format!("const ARRAY_REPEAT_VALUE: {elt_type} = {snip};\n{indentation}")),
+                        (elt_span, "ARRAY_REPEAT_VALUE".to_string())
+                    ], Applicability::MachineApplicable);


Made this MachineApplicable because ARRAY_REPEAT_VALUE is unlikely to conflict unless there's multiple instances of this in the same scope, and I'm reasonably sure the HIR walking should give us a span it's safe to put a new item on. This can be changed to MaybeIncorrect if there's any weird counterexamples

estebank · 2023-07-25T17:23:17Z

tests/ui/consts/const-fn-in-vec.rs

@@ -1,7 +1,11 @@
+static _MAYBE_STRINGS: [Option<String>; 5] = [None; 5];


If we annotate this file with // run-rustfix, does the test continue to pass? If so, let's add that to protect against involuntary regressions in the suggestions. (You might have to allow some lints, potentially.)

Ah unfortunately no, because the const uses the same name which conflicts. It might be a good idea to maybe make the identifier more unique (do we have a way of 'identifier-izing' an arbritrary string?). Something like Enum::Variant to ENUM_VARIANT might help

estebank · 2023-07-25T17:25:13Z

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+                {
+                    let help_msg = format!(
+                        "consider creating a new `const` item and initializing it with {value_kind} \
+                        to be used in the repeat position");


Suggested change

to be used in the repeat position");

to be used in the repeat position"

);

estebank

r=me after addressing the nitpicks.

estebank · 2023-07-25T17:26:10Z

r? @estebank

@bors r+

bors · 2023-07-25T17:26:12Z

📌 Commit 86b1122 has been approved by estebank

It is now in the queue for this repository.

clubby789 · 2023-07-25T17:33:54Z

I'd like to address the nitpicks, having a rustfix example seems like a good idea
@bors r-

Dylan-DPC · 2023-11-04T17:34:08Z

@clubby789 any updates on this?

estebank · 2023-11-07T19:57:17Z

@Dylan-DPC lets see if we can land as is and @clubby789 can open a follow up PR at their leisure.

@bors r+

bors · 2023-11-07T19:57:20Z

📌 Commit 86b1122 has been approved by estebank

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#113925 (Improve diagnostic for const ctors in array repeat expressions) - rust-lang#116399 (Small changes w/ `query::Erase<_>`) - rust-lang#117625 (Fix some clippy perf lints) - rust-lang#117655 (Method suggestion code tweaks) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#113925 - clubby789:const-ctor-repeat, r=estebank Improve diagnostic for const ctors in array repeat expressions Fixes rust-lang#113912

Update Rust toolchain from nightly-2023-11-08 to nightly-2023-11-09 without any other source changes. This is an automatically generated pull request. If any of the CI checks fail, manual intervention is required. In such a case, review the changes at https://github.com/rust-lang/rust from rust-lang@7adc89b up to rust-lang@fdaaaf9. The log for this commit range is: rust-lang@fdaaaf9f92 Auto merge of rust-lang#116930 - RalfJung:raw-ptr-match, r=davidtwco rust-lang@30588657b7 avoid unnecessary nested conditionals rust-lang@90fdc1fc27 Auto merge of rust-lang#117716 - GuillaumeGomez:rollup-83gnhll, r=GuillaumeGomez rust-lang@9d3c80248b Rollup merge of rust-lang#117713 - GuillaumeGomez:document-hidden-json, r=notriddle rust-lang@d8c52b378d Rollup merge of rust-lang#117702 - davidtwco:target-tier-refactors, r=petrochenkov rust-lang@5d00a5d936 Rollup merge of rust-lang#117679 - aDotInTheVoid:yes-core, r=GuillaumeGomez rust-lang@c828371179 Rollup merge of rust-lang#117282 - clubby789:recover-wrong-function-header, r=TaKO8Ki rust-lang@e05e4f38b5 Rollup merge of rust-lang#117263 - onur-ozkan:change-id-fix, r=saethlin rust-lang@341efb1017 Auto merge of rust-lang#117560 - lqd:issue-117146, r=matthewjasper rust-lang@33edea60f0 Add test for reexported hidden item with `--document-hidden-items` rust-lang@28acba3c61 Auto merge of rust-lang#115460 - zachs18:borrowedcursor_write_no_panic, r=dtolnay rust-lang@755629fe59 Auto merge of rust-lang#117706 - matthiaskrgr:rollup-lscx7dg, r=matthiaskrgr rust-lang@e0cb1cc296 bootstrap: add more detail on change-id comments rust-lang@e878100386 bootstrap: improve `fn check_version` rust-lang@ae4d18b2da handle the case when the change-id isn't found rust-lang@7e4ffa98b5 Rollup merge of rust-lang#117700 - Zalathar:rename-run-coverage, r=onur-ozkan rust-lang@55306535dd Rollup merge of rust-lang#117698 - nnethercote:space_between-2, r=petrochenkov rust-lang@b1b5a8ea9d Rollup merge of rust-lang#117667 - Alexendoo:doc-clippy-config, r=albertlarsan68 rust-lang@adf4981969 Rollup merge of rust-lang#117663 - klensy:bump-deps, r=davidtwco rust-lang@8198864377 Rollup merge of rust-lang#117650 - saethlin:inline-me-please, r=davidtwco rust-lang@ba7ec56639 Rollup merge of rust-lang#117531 - fmease:rustdoc-effects-properly-elide-x-crate-host-args, r=GuillaumeGomez rust-lang@b74a84c0bc Rollup merge of rust-lang#114316 - ecnelises:aix_doc, r=workingjubilee rust-lang@fab1054e17 Auto merge of rust-lang#117542 - compiler-errors:only-normalize-predicate, r=lcnr rust-lang@750c2ecd15 Auto merge of rust-lang#116881 - LuuuXXX:issue-110087, r=onur-ozkan rust-lang@b9b7982f72 Add AIX platform-support doc rust-lang@ef7ebaa788 rustc_target: move file for uniformity rust-lang@1af256fe8a targets: move target specs to spec/targets rust-lang@76aa83e3e1 target: move base specs to spec/base rust-lang@a573880373 coverage: Rename the `run-coverage` test mode to `coverage-run` rust-lang@7cc997d373 Auto merge of rust-lang#117699 - weihanglo:update-cargo, r=weihanglo rust-lang@0670466e2c Update cargo rust-lang@438b9a6e82 More tests for token stream pretty-printing with adjacent punctuation. rust-lang@783d4b8b26 Clarify `space_between`. rust-lang@91cfcb0219 Auto merge of rust-lang#117484 - Zalathar:tests, r=cjgillot rust-lang@97c9d8f405 Only use normalize_param_env when normalizing predicate in check_item_bounds rust-lang@1b8dee19e8 Fix issue rust-lang#110087 rust-lang@0d5ec963bb Auto merge of rust-lang#117692 - matthiaskrgr:rollup-umaf5pr, r=matthiaskrgr rust-lang@f72e974e3f Rollup merge of rust-lang#117655 - compiler-errors:method-tweaks, r=estebank rust-lang@7552dd19ad Rollup merge of rust-lang#117625 - nnethercote:clippy-perf, r=cuviper rust-lang@3c6307240c Rollup merge of rust-lang#116399 - WaffleLapkin:erase_small_things, r=cjgillot rust-lang@b724d9c90e Rollup merge of rust-lang#113925 - clubby789:const-ctor-repeat, r=estebank rust-lang@fcdd99edca Add -Zcross-crate-inline-threshold=yes rust-lang@e8cf29b584 rustdoc: minor changes suggested by clippy perf lints. rust-lang@ff0b4b6091 Auto merge of rust-lang#117672 - lqd:ci-gcc-lld, r=Kobzol rust-lang@1b3733e5a4 rustc: minor changes suggested by clippy perf lints. rust-lang@eca9a1533f Add an explanation for `transmute_unchecked` rust-lang@1d1fe9a205 add note to remember to update a url when bumping to gcc 10.1.0 rust-lang@434b69a1d6 tests/rustdoc-json: Rewrite tests no not use `#![no_core]`. rust-lang@0875f456f1 tests/rustdoc-json: Remove more needless uses of `#![no_core]`. rust-lang@f784fa7bd9 tests/rustdoc-json: Remove some needless uses of `#![no_core]`. rust-lang@d73eaaac5f ci: bump gcc on dist x64 linux builder to 9.5 rust-lang@f2fd8ad788 Document clippy_config in nightly-rustc docs rust-lang@eed89185bb bump some deps rust-lang@0add056dee Rework print_disambiguation_help rust-lang@88a37acb26 Yeet MethodCallComponents rust-lang@4e6f438d2a coverage: Register `test::Coverage` as the test suite for `tests/coverage` rust-lang@49127c64d6 coverage: Migrate `tests/coverage-map` into `tests/coverage` rust-lang@e9d04c5e24 coverage: Migrate `tests/run-coverage` into `tests/coverage` rust-lang@aea7c27eae coverage: Set up a macro for declaring unified coverage test suites rust-lang@3509aed632 coverage: Add `./x.py test coverage`, an alias for `coverage-map` and `run-coverage` rust-lang@e585a99230 coverage: Give each coverage test mode a separate output directory rust-lang@211d4cee8e coverage: Copy all remaining run-coverage tests into coverage-map rust-lang@4b76b97bc8 coverage: Copy all remaining coverage-map tests into run-coverage rust-lang@f5df56b26b coverage: Flatten `coverage-map/status-quo/` into its parent directory rust-lang@8eef39f082 coverage: Remove `tests/coverage-map/if.rs` rust-lang@7f8a6de72c coverage: Use `-Copt-level=2` by default in run-coverage tests rust-lang@1dcdf83927 rustdoc: properly elide cross-crate host effect args rust-lang@2dff90dc23 add test for issue 117146 rust-lang@de7a8305ae traverse region graph instead of SCCs to compute polonius loan scopes rust-lang@03b24f2756 remove some dead code rust-lang@70a8e157ab make pointer_structural_match warn-by-default rust-lang@af6c7e0ca1 also lint against fn ptr and raw ptr nested inside the const rust-lang@bec88ad4aa patterns: reject raw pointers that are not just integers rust-lang@be0b42fabe Recover from incorrectly ordered/duplicated function keywords rust-lang@b3d50255d9 Use consisntent style of `size_of` in query type erasure rust-lang@61361bb212 Use `transmute_unchecked` and make the types explicit in query type erasure rust-lang@11a64a1834 don't panic in BorrowedCursor::write rust-lang@86b112204a Improve diagnostic for const ctors in array repeat expressions Co-authored-by: celinval <celinval@users.noreply.github.com>

rustbot assigned eholk Jul 21, 2023

rustbot added 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 Jul 21, 2023

compiler-errors reviewed Jul 21, 2023

View reviewed changes

compiler/rustc_middle/src/traits/mod.rs Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the const-ctor-repeat branch from 7127f5c to 22ce932 Compare July 21, 2023 23:55

estebank reviewed Jul 24, 2023

View reviewed changes

compiler/rustc_hir_typeck/src/expr.rs Outdated Show resolved Hide resolved

estebank reviewed Jul 24, 2023

View reviewed changes

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated Show resolved Hide resolved

estebank approved these changes Jul 24, 2023

View reviewed changes

rust-cloud-vms bot force-pushed the const-ctor-repeat branch from 22ce932 to 8dccd6a Compare July 24, 2023 17:19

estebank reviewed Jul 24, 2023

View reviewed changes

compiler/rustc_hir_typeck/src/expr.rs Outdated Show resolved Hide resolved

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated Show resolved Hide resolved

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Outdated Show resolved Hide resolved

rust-cloud-vms bot force-pushed the const-ctor-repeat branch from 8dccd6a to 7857b27 Compare July 24, 2023 20:06

clubby789 commented Jul 24, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

Improve diagnostic for const ctors in array repeat expressions

86b1122

rust-cloud-vms bot force-pushed the const-ctor-repeat branch from 7857b27 to 86b1122 Compare July 24, 2023 20:31

estebank reviewed Jul 25, 2023

View reviewed changes

estebank approved these changes Jul 25, 2023

View reviewed changes

rustbot assigned estebank and unassigned eholk Jul 25, 2023

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 Jul 25, 2023

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 25, 2023

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 7, 2023

matthiaskrgr mentioned this pull request Nov 7, 2023

Rollup of 4 pull requests #117692

Merged

bors merged commit b724d9c into rust-lang:master Nov 8, 2023

rustbot added this to the 1.75.0 milestone Nov 8, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve diagnostic for const ctors in array repeat expressions #113925

Improve diagnostic for const ctors in array repeat expressions #113925

clubby789 commented Jul 21, 2023

rustbot commented Jul 21, 2023

estebank Jul 24, 2023

clubby789 commented Jul 24, 2023

estebank left a comment

clubby789 commented Jul 24, 2023

estebank commented Jul 24, 2023 •

edited

Loading

clubby789 commented Jul 24, 2023

clubby789 Jul 24, 2023

This comment has been minimized.

estebank Jul 25, 2023

clubby789 Jul 25, 2023

estebank Jul 25, 2023

estebank left a comment

estebank commented Jul 25, 2023

bors commented Jul 25, 2023

clubby789 commented Jul 25, 2023

Dylan-DPC commented Nov 4, 2023

estebank commented Nov 7, 2023

bors commented Nov 7, 2023

		@@ -1,7 +1,11 @@
		static _MAYBE_STRINGS: [Option<String>; 5] = [None; 5];

	to be used in the repeat position");
	to be used in the repeat position"
	);

Improve diagnostic for const ctors in array repeat expressions #113925

Improve diagnostic for const ctors in array repeat expressions #113925

Conversation

clubby789 commented Jul 21, 2023

rustbot commented Jul 21, 2023

estebank Jul 24, 2023

Choose a reason for hiding this comment

clubby789 commented Jul 24, 2023

estebank left a comment

Choose a reason for hiding this comment

clubby789 commented Jul 24, 2023

estebank commented Jul 24, 2023 • edited Loading

clubby789 commented Jul 24, 2023

clubby789 Jul 24, 2023

Choose a reason for hiding this comment

This comment has been minimized.

estebank Jul 25, 2023

Choose a reason for hiding this comment

clubby789 Jul 25, 2023

Choose a reason for hiding this comment

estebank Jul 25, 2023

Choose a reason for hiding this comment

estebank left a comment

Choose a reason for hiding this comment

estebank commented Jul 25, 2023

bors commented Jul 25, 2023

clubby789 commented Jul 25, 2023

Dylan-DPC commented Nov 4, 2023

estebank commented Nov 7, 2023

bors commented Nov 7, 2023

estebank commented Jul 24, 2023 •

edited

Loading