Skip to content

Commit d95ce94

Browse files
committed
Auto merge of rust-lang#17616 - Veykril:config-param-hints, r=Veykril
Fix incorrect generic parameter hint defaults Missed this in the review but we should show const param hints, not lifetime param hints by default
2 parents 523465a + 7ef5f46 commit d95ce94

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -511,9 +511,9 @@ config_data! {
511511
/// Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc).
512512
inlayHints_expressionAdjustmentHints_mode: AdjustmentHintsModeDef = AdjustmentHintsModeDef::Prefix,
513513
/// Whether to show const generic parameter name inlay hints.
514-
inlayHints_genericParameterHints_const_enable: bool= false,
514+
inlayHints_genericParameterHints_const_enable: bool= true,
515515
/// Whether to show generic lifetime parameter name inlay hints.
516-
inlayHints_genericParameterHints_lifetime_enable: bool = true,
516+
inlayHints_genericParameterHints_lifetime_enable: bool = false,
517517
/// Whether to show generic type parameter name inlay hints.
518518
inlayHints_genericParameterHints_type_enable: bool = false,
519519
/// Whether to show implicit drop hints.

src/tools/rust-analyzer/docs/user/generated_config.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -655,12 +655,12 @@ Whether to hide inlay hints for type adjustments outside of `unsafe` blocks.
655655
--
656656
Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc).
657657
--
658-
[[rust-analyzer.inlayHints.genericParameterHints.const.enable]]rust-analyzer.inlayHints.genericParameterHints.const.enable (default: `false`)::
658+
[[rust-analyzer.inlayHints.genericParameterHints.const.enable]]rust-analyzer.inlayHints.genericParameterHints.const.enable (default: `true`)::
659659
+
660660
--
661661
Whether to show const generic parameter name inlay hints.
662662
--
663-
[[rust-analyzer.inlayHints.genericParameterHints.lifetime.enable]]rust-analyzer.inlayHints.genericParameterHints.lifetime.enable (default: `true`)::
663+
[[rust-analyzer.inlayHints.genericParameterHints.lifetime.enable]]rust-analyzer.inlayHints.genericParameterHints.lifetime.enable (default: `false`)::
664664
+
665665
--
666666
Whether to show generic lifetime parameter name inlay hints.

src/tools/rust-analyzer/editors/code/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@
19141914
"properties": {
19151915
"rust-analyzer.inlayHints.genericParameterHints.const.enable": {
19161916
"markdownDescription": "Whether to show const generic parameter name inlay hints.",
1917-
"default": false,
1917+
"default": true,
19181918
"type": "boolean"
19191919
}
19201920
}
@@ -1924,7 +1924,7 @@
19241924
"properties": {
19251925
"rust-analyzer.inlayHints.genericParameterHints.lifetime.enable": {
19261926
"markdownDescription": "Whether to show generic lifetime parameter name inlay hints.",
1927-
"default": true,
1927+
"default": false,
19281928
"type": "boolean"
19291929
}
19301930
}

0 commit comments

Comments
 (0)