Skip to content

Commit 2036fdd

Browse files
borsbors
committed
Auto merge of rust-lang#109668 - GuillaumeGomez:rollup-j01if4b, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - rust-lang#109330 (rustdoc: Fix ICE for intra-doc link on intermediate re-export) - rust-lang#109354 (Remove the `NodeId` of `ast::ExprKind::Async`) - rust-lang#109445 (Allow passing the --nocapture flag to compiletest) - rust-lang#109512 (bump `askama_derive` to 0.12.1) - rust-lang#109637 (Add missing needs-asm-support annotation to ui/simple_global_asm.rs) - rust-lang#109666 (Correct ASCII case comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents dd19135 + c0dec2b commit 2036fdd

File tree

23 files changed

+235
-156
lines changed

23 files changed

+235
-156
lines changed

‎Cargo.lock‎

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ dependencies = [
149149

150150
[[package]]
151151
name = "askama_derive"
152-
version = "0.12.0"
152+
version = "0.12.1"
153153
source = "registry+https://github.com/rust-lang/crates.io-index"
154-
checksum = "e80b5ad1afe82872b7aa3e9de9b206ecb85584aa324f0f60fa4c903ce935936b"
154+
checksum = "c22fbe0413545c098358e56966ff22cdd039e10215ae213cfbd65032b119fc94"
155155
dependencies = [
156156
"basic-toml",
157157
"mime",
@@ -160,7 +160,7 @@ dependencies = [
160160
"proc-macro2",
161161
"quote",
162162
"serde",
163-
"syn",
163+
"syn 2.0.8",
164164
]
165165

166166
[[package]]
@@ -590,7 +590,7 @@ checksum = "d552b2fa341f5fc35c6b917b1d289d3c3a34d0b74e579390ea6192d6152a8cdb"
590590
dependencies = [
591591
"proc-macro2",
592592
"quote",
593-
"syn",
593+
"syn 1.0.102",
594594
"synstructure",
595595
]
596596

@@ -702,7 +702,7 @@ dependencies = [
702702
"proc-macro-error",
703703
"proc-macro2",
704704
"quote",
705-
"syn",
705+
"syn 1.0.102",
706706
]
707707

708708
[[package]]
@@ -715,7 +715,7 @@ dependencies = [
715715
"proc-macro-error",
716716
"proc-macro2",
717717
"quote",
718-
"syn",
718+
"syn 1.0.102",
719719
]
720720

721721
[[package]]
@@ -757,7 +757,7 @@ dependencies = [
757757
"rustc_tools_util",
758758
"semver",
759759
"serde",
760-
"syn",
760+
"syn 1.0.102",
761761
"tempfile",
762762
"termize",
763763
"tester",
@@ -1108,7 +1108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
11081108
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
11091109
dependencies = [
11101110
"quote",
1111-
"syn",
1111+
"syn 1.0.102",
11121112
]
11131113

11141114
[[package]]
@@ -1154,7 +1154,7 @@ version = "0.1.70"
11541154
dependencies = [
11551155
"itertools",
11561156
"quote",
1157-
"syn",
1157+
"syn 1.0.102",
11581158
]
11591159

11601160
[[package]]
@@ -1176,7 +1176,7 @@ checksum = "71f31892cd5c62e414316f2963c5689242c43d8e7bbcaaeca97e5e28c95d91d9"
11761176
dependencies = [
11771177
"proc-macro2",
11781178
"quote",
1179-
"syn",
1179+
"syn 1.0.102",
11801180
]
11811181

11821182
[[package]]
@@ -1189,7 +1189,7 @@ dependencies = [
11891189
"proc-macro2",
11901190
"quote",
11911191
"rustc_version",
1192-
"syn",
1192+
"syn 1.0.102",
11931193
]
11941194

11951195
[[package]]
@@ -1267,7 +1267,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
12671267
dependencies = [
12681268
"proc-macro2",
12691269
"quote",
1270-
"syn",
1270+
"syn 1.0.102",
12711271
]
12721272

12731273
[[package]]
@@ -1683,7 +1683,7 @@ checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
16831683
dependencies = [
16841684
"proc-macro2",
16851685
"quote",
1686-
"syn",
1686+
"syn 1.0.102",
16871687
]
16881688

16891689
[[package]]
@@ -2530,7 +2530,7 @@ dependencies = [
25302530
"markup5ever",
25312531
"proc-macro2",
25322532
"quote",
2533-
"syn",
2533+
"syn 1.0.102",
25342534
]
25352535

25362536
[[package]]
@@ -2619,7 +2619,7 @@ checksum = "9ddb07844c2ffc4c28840e799e9e54ff054393cf090740decf25624e9d94b93a"
26192619
dependencies = [
26202620
"proc-macro2",
26212621
"quote",
2622-
"syn",
2622+
"syn 1.0.102",
26232623
]
26242624

26252625
[[package]]
@@ -3089,7 +3089,7 @@ checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305"
30893089
dependencies = [
30903090
"proc-macro2",
30913091
"quote",
3092-
"syn",
3092+
"syn 1.0.102",
30933093
]
30943094

30953095
[[package]]
@@ -3679,7 +3679,7 @@ dependencies = [
36793679
"pest_meta",
36803680
"proc-macro2",
36813681
"quote",
3682-
"syn",
3682+
"syn 1.0.102",
36833683
]
36843684

36853685
[[package]]
@@ -3823,7 +3823,7 @@ dependencies = [
38233823
"proc-macro-error-attr",
38243824
"proc-macro2",
38253825
"quote",
3826-
"syn",
3826+
"syn 1.0.102",
38273827
"version_check",
38283828
]
38293829

@@ -3846,9 +3846,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
38463846

38473847
[[package]]
38483848
name = "proc-macro2"
3849-
version = "1.0.46"
3849+
version = "1.0.53"
38503850
source = "registry+https://github.com/rust-lang/crates.io-index"
3851-
checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
3851+
checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
38523852
dependencies = [
38533853
"unicode-ident",
38543854
]
@@ -3925,9 +3925,9 @@ checksum = "07589615d719a60c8dd8a4622e7946465dfef20d1a428f969e3443e7386d5f45"
39253925

39263926
[[package]]
39273927
name = "quote"
3928-
version = "1.0.21"
3928+
version = "1.0.26"
39293929
source = "registry+https://github.com/rust-lang/crates.io-index"
3930-
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
3930+
checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
39313931
dependencies = [
39323932
"proc-macro2",
39333933
]
@@ -4224,7 +4224,7 @@ dependencies = [
42244224
"regex",
42254225
"serde_json",
42264226
"smallvec",
4227-
"syn",
4227+
"syn 1.0.102",
42284228
"url",
42294229
"winapi",
42304230
]
@@ -4934,7 +4934,7 @@ dependencies = [
49344934
"fluent-syntax",
49354935
"proc-macro2",
49364936
"quote",
4937-
"syn",
4937+
"syn 1.0.102",
49384938
"synstructure",
49394939
"unic-langid",
49404940
]
@@ -5514,7 +5514,7 @@ dependencies = [
55145514
"proc-macro2",
55155515
"quote",
55165516
"serde",
5517-
"syn",
5517+
"syn 1.0.102",
55185518
]
55195519

55205520
[[package]]
@@ -5684,7 +5684,7 @@ checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
56845684
dependencies = [
56855685
"proc-macro2",
56865686
"quote",
5687-
"syn",
5687+
"syn 1.0.102",
56885688
]
56895689

56905690
[[package]]
@@ -6028,7 +6028,7 @@ dependencies = [
60286028
"proc-macro2",
60296029
"quote",
60306030
"rustversion",
6031-
"syn",
6031+
"syn 1.0.102",
60326032
]
60336033

60346034
[[package]]
@@ -6048,6 +6048,17 @@ dependencies = [
60486048
"unicode-ident",
60496049
]
60506050

6051+
[[package]]
6052+
name = "syn"
6053+
version = "2.0.8"
6054+
source = "registry+https://github.com/rust-lang/crates.io-index"
6055+
checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
6056+
dependencies = [
6057+
"proc-macro2",
6058+
"quote",
6059+
"unicode-ident",
6060+
]
6061+
60516062
[[package]]
60526063
name = "synstructure"
60536064
version = "0.12.6"
@@ -6056,7 +6067,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
60566067
dependencies = [
60576068
"proc-macro2",
60586069
"quote",
6059-
"syn",
6070+
"syn 1.0.102",
60606071
"unicode-xid",
60616072
]
60626073

@@ -6190,7 +6201,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
61906201
dependencies = [
61916202
"proc-macro2",
61926203
"quote",
6193-
"syn",
6204+
"syn 1.0.102",
61946205
]
61956206

61966207
[[package]]
@@ -6387,7 +6398,7 @@ checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
63876398
dependencies = [
63886399
"proc-macro2",
63896400
"quote",
6390-
"syn",
6401+
"syn 1.0.102",
63916402
]
63926403

63936404
[[package]]
@@ -6586,7 +6597,7 @@ checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8"
65866597
dependencies = [
65876598
"proc-macro-hack",
65886599
"quote",
6589-
"syn",
6600+
"syn 1.0.102",
65906601
"unic-langid-impl",
65916602
]
65926603

@@ -6834,7 +6845,7 @@ dependencies = [
68346845
"once_cell",
68356846
"proc-macro2",
68366847
"quote",
6837-
"syn",
6848+
"syn 1.0.102",
68386849
"wasm-bindgen-shared",
68396850
]
68406851

@@ -6856,7 +6867,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
68566867
dependencies = [
68576868
"proc-macro2",
68586869
"quote",
6859-
"syn",
6870+
"syn 1.0.102",
68606871
"wasm-bindgen-backend",
68616872
"wasm-bindgen-shared",
68626873
]
@@ -7082,7 +7093,7 @@ checksum = "ca800d73d6b7a7ee54f2608205c98b549fca71c9500c1abcb3abdc7708b4a8cb"
70827093
dependencies = [
70837094
"proc-macro2",
70847095
"quote",
7085-
"syn",
7096+
"syn 1.0.102",
70867097
"synstructure",
70877098
]
70887099

@@ -7103,7 +7114,7 @@ checksum = "2e8aa86add9ddbd2409c1ed01e033cd457d79b1b1229b64922c25095c595e829"
71037114
dependencies = [
71047115
"proc-macro2",
71057116
"quote",
7106-
"syn",
7117+
"syn 1.0.102",
71077118
"synstructure",
71087119
]
71097120

@@ -7132,6 +7143,6 @@ checksum = "2154cb6e2a748163354165e22c6a555effb09ca2d16334767bf66bb404f2206e"
71327143
dependencies = [
71337144
"proc-macro2",
71347145
"quote",
7135-
"syn",
7146+
"syn 1.0.102",
71367147
"synstructure",
71377148
]

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1426,13 +1426,9 @@ pub enum ExprKind {
14261426
Block(P<Block>, Option<Label>),
14271427
/// An async block (`async move { ... }`).
14281428
///
1429-
/// The `NodeId` is the `NodeId` for the closure that results from
1430-
/// desugaring an async block, just like the NodeId field in the
1431-
/// `Async::Yes` variant. This is necessary in order to create a def for the
1432-
/// closure which can be used as a parent of any child defs. Defs
1433-
/// created during lowering cannot be made the parent of any other
1434-
/// preexisting defs.
1435-
Async(CaptureBy, NodeId, P<Block>),
1429+
/// The async block used to have a `NodeId`, which was removed in favor of
1430+
/// using the parent `NodeId` of the parent `Expr`.
1431+
Async(CaptureBy, P<Block>),
14361432
/// An await expression (`my_future.await`).
14371433
Await(P<Expr>),
14381434

‎compiler/rustc_ast/src/mut_visit.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,8 +1407,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
14071407
vis.visit_block(blk);
14081408
visit_opt(label, |label| vis.visit_label(label));
14091409
}
1410-
ExprKind::Async(_capture_by, node_id, body) => {
1411-
vis.visit_id(node_id);
1410+
ExprKind::Async(_capture_by, body) => {
14121411
vis.visit_block(body);
14131412
}
14141413
ExprKind::Await(expr) => vis.visit_expr(expr),

‎compiler/rustc_ast/src/visit.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
860860
walk_list!(visitor, visit_label, opt_label);
861861
visitor.visit_block(block);
862862
}
863-
ExprKind::Async(_, _, body) => {
863+
ExprKind::Async(_, body) => {
864864
visitor.visit_block(body);
865865
}
866866
ExprKind::Await(expr) => visitor.visit_expr(expr),

0 commit comments

Comments
 (0)