Skip to content

Commit 16ef2a4

Browse files
authored
Merge pull request #20424 from rust-lang/rustc-pull
Rustc pull update
2 parents 4e147e7 + 966e694 commit 16ef2a4

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10699,20 +10699,6 @@ The tracking issue for this feature is: [#77998]
1069910699

1070010700
[#77998]: https://github.com/rust-lang/rust/issues/77998
1070110701

10702-
------------------------
10703-
"##,
10704-
default_severity: Severity::Allow,
10705-
warn_since: None,
10706-
deny_since: None,
10707-
},
10708-
Lint {
10709-
label: "strict_overflow_ops",
10710-
description: r##"# `strict_overflow_ops`
10711-
10712-
The tracking issue for this feature is: [#118260]
10713-
10714-
[#118260]: https://github.com/rust-lang/rust/issues/118260
10715-
1071610702
------------------------
1071710703
"##,
1071810704
default_severity: Severity::Allow,

crates/syntax-bridge/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ where
127127

128128
// The following items are what `rustc` macro can be parsed into :
129129
// link: https://github.com/rust-lang/rust/blob/9ebf47851a357faa4cd97f4b1dc7835f6376e639/src/libsyntax/ext/expand.rs#L141
130-
// * Expr(P<ast::Expr>) -> token_tree_to_expr
131-
// * Pat(P<ast::Pat>) -> token_tree_to_pat
132-
// * Ty(P<ast::Ty>) -> token_tree_to_ty
130+
// * Expr(Box<ast::Expr>) -> token_tree_to_expr
131+
// * Pat(Box<ast::Pat>) -> token_tree_to_pat
132+
// * Ty(Box<ast::Ty>) -> token_tree_to_ty
133133
// * Stmts(SmallVec<[ast::Stmt; 1]>) -> token_tree_to_stmts
134-
// * Items(SmallVec<[P<ast::Item>; 1]>) -> token_tree_to_items
134+
// * Items(SmallVec<[Box<ast::Item>; 1]>) -> token_tree_to_items
135135
//
136136
// * TraitItems(SmallVec<[ast::TraitItem; 1]>)
137137
// * AssocItems(SmallVec<[ast::AssocItem; 1]>)

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
733dab558992d902d6d17576de1da768094e2cf3
1+
21a19c297d4f5a03501d92ca251bd7a17073c08a

0 commit comments

Comments
 (0)