Skip to content

Commit 213a824

Browse files
committed
Merge ref '6159a44067eb' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 6159a44067ebce42b38f062cc7df267a1348e092 Filtered ref: 6ab1e12 Upstream diff: rust-lang/rust@c5dabe8...6159a44 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents da75f84 + 6ab1e12 commit 213a824

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crates/ide-db/src/generated/lints.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10723,9 +10723,9 @@ The tracking issue for this feature is: [#99108]
1072310723
label: "strict_provenance_lints",
1072410724
description: r##"# `strict_provenance_lints`
1072510725

10726-
The tracking issue for this feature is: [#95228]
10726+
The tracking issue for this feature is: [#130351]
1072710727

10728-
[#95228]: https://github.com/rust-lang/rust/issues/95228
10728+
[#130351]: https://github.com/rust-lang/rust/issues/130351
1072910729
-----
1073010730

1073110731
The `strict_provenance_lints` feature allows to enable the `fuzzy_provenance_casts` and `lossy_provenance_casts` lints.

lib/ungrammar/ungrammar2json/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn grammar_to_json(grammar: &Grammar, mut obj: write_json::Object<'_>) {
4343
}
4444
}
4545

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<'_>) {
4747
match rule {
4848
Rule::Labeled { label, rule } => {
4949
obj.string("label", label);

0 commit comments

Comments
 (0)