Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #21062 from lnicola/sync-from-rust
minor: sync from downstream
| -rw-r--r-- | crates/ide-db/src/generated/lints.rs | 4 | ||||
| -rw-r--r-- | lib/ungrammar/ungrammar2json/src/main.rs | 2 | ||||
| -rw-r--r-- | rust-version | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs index 5eb7e92ffb..7f4dad873c 100644 --- 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 index 3e88458069..3b8588c086 100644 --- 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 index 0e89b4ab6a..f545ef4d2b 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c5dabe8cf798123087d094f06417f5a767ca73e8 +6159a44067ebce42b38f062cc7df267a1348e092 |