Merge pull request #21062 from lnicola/sync-from-rust

lnicola · web-flow · commit dc8c1e8151b0 · 2025-11-19T06:38:52.000Z
minor: sync from downstream
diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
@@ -10723,9 +10723,9 @@ The tracking issue for this feature is: [#99108]
         label: "strict_provenance_lints",
         description: r##"# `strict_provenance_lints`
 
-The tracking issue for this feature is: [#95228]
+The tracking issue for this feature is: [#130351]
 
-[#95228]: https://github.com/rust-lang/rust/issues/95228
+[#130351]: https://github.com/rust-lang/rust/issues/130351
 -----
 
 The `strict_provenance_lints` feature allows to enable the `fuzzy_provenance_casts` and `lossy_provenance_casts` lints.
diff --git a/lib/ungrammar/ungrammar2json/src/main.rs b/lib/ungrammar/ungrammar2json/src/main.rs
@@ -43,7 +43,7 @@ fn grammar_to_json(grammar: &Grammar, mut obj: write_json::Object<'_>) {
     }
 }
 
-fn rule_to_json(grammar: &Grammar, rule: &Rule, mut obj: write_json::Object) {
+fn rule_to_json(grammar: &Grammar, rule: &Rule, mut obj: write_json::Object<'_>) {
     match rule {
         Rule::Labeled { label, rule } => {
             obj.string("label", label);
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c5dabe8cf798123087d094f06417f5a767ca73e8
+6159a44067ebce42b38f062cc7df267a1348e092

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ fn grammar_to_json(grammar: &Grammar, mut obj: write_json::Object<'_>) {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-fn rule_to_json(grammar: &Grammar, rule: &Rule, mut obj: write_json::Object) {`
	`46`	`+fn rule_to_json(grammar: &Grammar, rule: &Rule, mut obj: write_json::Object<'_>) {`
`47`	`47`	`match rule {`
`48`	`48`	`Rule::Labeled { label, rule } => {`
`49`	`49`	`obj.string("label", label);`