Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 0ca3921

Browse files
author
The Miri Cronjob Bot
committed
Merge from rustc
2 parents 2a53a41 + e32ec45 commit 0ca3921

File tree

915 files changed

+20889
-6799
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

915 files changed

+20889
-6799
lines changed

‎Cargo.lock‎

Lines changed: 44 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ version = "0.4.2"
195195
source = "registry+https://github.com/rust-lang/crates.io-index"
196196
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
197197
dependencies = [
198-
"object 0.36.5",
198+
"object 0.36.7",
199199
]
200200

201201
[[package]]
@@ -405,9 +405,9 @@ version = "0.1.0"
405405

406406
[[package]]
407407
name = "cc"
408-
version = "1.2.0"
408+
version = "1.2.5"
409409
source = "registry+https://github.com/rust-lang/crates.io-index"
410-
checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
410+
checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e"
411411
dependencies = [
412412
"shlex",
413413
]
@@ -503,9 +503,9 @@ dependencies = [
503503

504504
[[package]]
505505
name = "clap_complete"
506-
version = "4.5.39"
506+
version = "4.5.40"
507507
source = "registry+https://github.com/rust-lang/crates.io-index"
508-
checksum = "fd4db298d517d5fa00b2b84bbe044efd3fde43874a41db0d46f91994646a2da4"
508+
checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9"
509509
dependencies = [
510510
"clap",
511511
]
@@ -1107,19 +1107,19 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
11071107

11081108
[[package]]
11091109
name = "env_filter"
1110-
version = "0.1.2"
1110+
version = "0.1.3"
11111111
source = "registry+https://github.com/rust-lang/crates.io-index"
1112-
checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
1112+
checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
11131113
dependencies = [
11141114
"log",
11151115
"regex",
11161116
]
11171117

11181118
[[package]]
11191119
name = "env_logger"
1120-
version = "0.11.5"
1120+
version = "0.11.6"
11211121
source = "registry+https://github.com/rust-lang/crates.io-index"
1122-
checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
1122+
checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
11231123
dependencies = [
11241124
"anstream",
11251125
"anstyle",
@@ -1153,9 +1153,9 @@ dependencies = [
11531153

11541154
[[package]]
11551155
name = "expect-test"
1156-
version = "1.5.0"
1156+
version = "1.5.1"
11571157
source = "registry+https://github.com/rust-lang/crates.io-index"
1158-
checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
1158+
checksum = "63af43ff4431e848fb47472a920f14fa71c24de13255a5692e93d4e90302acb0"
11591159
dependencies = [
11601160
"dissimilar",
11611161
"once_cell",
@@ -1212,7 +1212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
12121212
checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
12131213
dependencies = [
12141214
"crc32fast",
1215-
"miniz_oxide 0.8.1",
1215+
"miniz_oxide 0.8.2",
12161216
]
12171217

12181218
[[package]]
@@ -1257,9 +1257,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
12571257

12581258
[[package]]
12591259
name = "foldhash"
1260-
version = "0.1.3"
1260+
version = "0.1.4"
12611261
source = "registry+https://github.com/rust-lang/crates.io-index"
1262-
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
1262+
checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
12631263

12641264
[[package]]
12651265
name = "form_urlencoded"
@@ -2305,9 +2305,9 @@ dependencies = [
23052305

23062306
[[package]]
23072307
name = "miniz_oxide"
2308-
version = "0.8.1"
2308+
version = "0.8.2"
23092309
source = "registry+https://github.com/rust-lang/crates.io-index"
2310-
checksum = "a2ef2593ffb6958c941575cee70c8e257438749971869c4ae5acf6f91a168a61"
2310+
checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
23112311
dependencies = [
23122312
"adler2",
23132313
]
@@ -2526,17 +2526,17 @@ dependencies = [
25262526

25272527
[[package]]
25282528
name = "object"
2529-
version = "0.36.5"
2529+
version = "0.36.7"
25302530
source = "registry+https://github.com/rust-lang/crates.io-index"
2531-
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
2531+
checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
25322532
dependencies = [
25332533
"crc32fast",
25342534
"flate2",
25352535
"hashbrown 0.15.2",
25362536
"indexmap",
25372537
"memchr",
25382538
"ruzstd",
2539-
"wasmparser 0.218.0",
2539+
"wasmparser 0.222.0",
25402540
]
25412541

25422542
[[package]]
@@ -2706,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
27062706
checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
27072707
dependencies = [
27082708
"memchr",
2709-
"thiserror 2.0.7",
2709+
"thiserror 2.0.9",
27102710
"ucd-trie",
27112711
]
27122712

@@ -3169,7 +3169,7 @@ dependencies = [
31693169
"build_helper",
31703170
"gimli 0.31.1",
31713171
"libc",
3172-
"object 0.36.5",
3172+
"object 0.36.7",
31733173
"regex",
31743174
"serde_json",
31753175
"similar",
@@ -3488,7 +3488,7 @@ dependencies = [
34883488
"itertools",
34893489
"libc",
34903490
"measureme",
3491-
"object 0.36.5",
3491+
"object 0.36.7",
34923492
"rustc-demangle",
34933493
"rustc_abi",
34943494
"rustc_ast",
@@ -3527,7 +3527,7 @@ dependencies = [
35273527
"either",
35283528
"itertools",
35293529
"libc",
3530-
"object 0.36.5",
3530+
"object 0.36.7",
35313531
"pathdiff",
35323532
"regex",
35333533
"rustc_abi",
@@ -4529,7 +4529,7 @@ name = "rustc_target"
45294529
version = "0.0.0"
45304530
dependencies = [
45314531
"bitflags",
4532-
"object 0.36.5",
4532+
"object 0.36.7",
45334533
"rustc_abi",
45344534
"rustc_data_structures",
45354535
"rustc_fs_util",
@@ -4882,9 +4882,9 @@ dependencies = [
48824882

48834883
[[package]]
48844884
name = "serde_json"
4885-
version = "1.0.133"
4885+
version = "1.0.134"
48864886
source = "registry+https://github.com/rust-lang/crates.io-index"
4887-
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
4887+
checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
48884888
dependencies = [
48894889
"indexmap",
48904890
"itoa",
@@ -5279,11 +5279,11 @@ dependencies = [
52795279

52805280
[[package]]
52815281
name = "thiserror"
5282-
version = "2.0.7"
5282+
version = "2.0.9"
52835283
source = "registry+https://github.com/rust-lang/crates.io-index"
5284-
checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767"
5284+
checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
52855285
dependencies = [
5286-
"thiserror-impl 2.0.7",
5286+
"thiserror-impl 2.0.9",
52875287
]
52885288

52895289
[[package]]
@@ -5299,9 +5299,9 @@ dependencies = [
52995299

53005300
[[package]]
53015301
name = "thiserror-impl"
5302-
version = "2.0.7"
5302+
version = "2.0.9"
53035303
source = "registry+https://github.com/rust-lang/crates.io-index"
5304-
checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36"
5304+
checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
53055305
dependencies = [
53065306
"proc-macro2",
53075307
"quote",
@@ -5316,7 +5316,7 @@ checksum = "813ba76597db32dc4f6992fd8bf8f394715b88d352fd97401da67dab6283b4c6"
53165316
dependencies = [
53175317
"gimli 0.30.0",
53185318
"hashbrown 0.14.5",
5319-
"object 0.36.5",
5319+
"object 0.36.7",
53205320
"tracing",
53215321
]
53225322

@@ -5413,9 +5413,9 @@ dependencies = [
54135413

54145414
[[package]]
54155415
name = "tinyvec"
5416-
version = "1.8.0"
5416+
version = "1.8.1"
54175417
source = "registry+https://github.com/rust-lang/crates.io-index"
5418-
checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
5418+
checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
54195419
dependencies = [
54205420
"tinyvec_macros",
54215421
]
@@ -5955,12 +5955,12 @@ dependencies = [
59555955

59565956
[[package]]
59575957
name = "wasm-encoder"
5958-
version = "0.221.2"
5958+
version = "0.222.0"
59595959
source = "registry+https://github.com/rust-lang/crates.io-index"
5960-
checksum = "c17a3bd88f2155da63a1f2fcb8a56377a24f0b6dfed12733bb5f544e86f690c5"
5960+
checksum = "3432682105d7e994565ef928ccf5856cf6af4ba3dddebedb737f61caed70f956"
59615961
dependencies = [
59625962
"leb128",
5963-
"wasmparser 0.221.2",
5963+
"wasmparser 0.222.0",
59645964
]
59655965

59665966
[[package]]
@@ -5979,15 +5979,6 @@ dependencies = [
59795979
"wasmparser 0.219.1",
59805980
]
59815981

5982-
[[package]]
5983-
name = "wasmparser"
5984-
version = "0.218.0"
5985-
source = "registry+https://github.com/rust-lang/crates.io-index"
5986-
checksum = "b09e46c7fceceaa72b2dd1a8a137ea7fd8f93dfaa69806010a709918e496c5dc"
5987-
dependencies = [
5988-
"bitflags",
5989-
]
5990-
59915982
[[package]]
59925983
name = "wasmparser"
59935984
version = "0.219.1"
@@ -6004,9 +5995,9 @@ dependencies = [
60045995

60055996
[[package]]
60065997
name = "wasmparser"
6007-
version = "0.221.2"
5998+
version = "0.222.0"
60085999
source = "registry+https://github.com/rust-lang/crates.io-index"
6009-
checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083"
6000+
checksum = "4adf50fde1b1a49c1add6a80d47aea500c88db70551805853aa8b88f3ea27ab5"
60106001
dependencies = [
60116002
"bitflags",
60126003
"indexmap",
@@ -6015,22 +6006,22 @@ dependencies = [
60156006

60166007
[[package]]
60176008
name = "wast"
6018-
version = "221.0.2"
6009+
version = "222.0.0"
60196010
source = "registry+https://github.com/rust-lang/crates.io-index"
6020-
checksum = "fcc4470b9de917ba199157d1f0ae104f2ae362be728c43e68c571c7715bd629e"
6011+
checksum = "5ce7191f4b7da0dd300cc32476abae6457154e4625d9b1bc26890828a9a26f6e"
60216012
dependencies = [
60226013
"bumpalo",
60236014
"leb128",
60246015
"memchr",
60256016
"unicode-width 0.2.0",
6026-
"wasm-encoder 0.221.2",
6017+
"wasm-encoder 0.222.0",
60276018
]
60286019

60296020
[[package]]
60306021
name = "wat"
6031-
version = "1.221.2"
6022+
version = "1.222.0"
60326023
source = "registry+https://github.com/rust-lang/crates.io-index"
6033-
checksum = "6b1f3c6d82af47286494c6caea1d332037f5cbeeac82bbf5ef59cb8c201c466e"
6024+
checksum = "8fde61b4b52f9a84ae31b5e8902a2cd3162ea45d8bf564c729c3288fe52f4334"
60346025
dependencies = [
60356026
"wast",
60366027
]

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use rustc_data_structures::sync::Lrc;
3131
use rustc_macros::{Decodable, Encodable, HashStable_Generic};
3232
pub use rustc_span::AttrId;
3333
use rustc_span::source_map::{Spanned, respan};
34-
use rustc_span::{DUMMY_SP, ErrorGuaranteed, Ident, Span, Symbol, kw, sym};
34+
use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, sym};
3535
use thin_vec::{ThinVec, thin_vec};
3636

3737
pub use crate::format::*;
@@ -387,22 +387,15 @@ impl GenericParam {
387387

388388
/// Represents lifetime, type and const parameters attached to a declaration of
389389
/// a function, enum, trait, etc.
390-
#[derive(Clone, Encodable, Decodable, Debug)]
390+
#[derive(Clone, Encodable, Decodable, Debug, Default)]
391391
pub struct Generics {
392392
pub params: ThinVec<GenericParam>,
393393
pub where_clause: WhereClause,
394394
pub span: Span,
395395
}
396396

397-
impl Default for Generics {
398-
/// Creates an instance of `Generics`.
399-
fn default() -> Generics {
400-
Generics { params: ThinVec::new(), where_clause: Default::default(), span: DUMMY_SP }
401-
}
402-
}
403-
404397
/// A where-clause in a definition.
405-
#[derive(Clone, Encodable, Decodable, Debug)]
398+
#[derive(Clone, Encodable, Decodable, Debug, Default)]
406399
pub struct WhereClause {
407400
/// `true` if we ate a `where` token.
408401
///
@@ -419,12 +412,6 @@ impl WhereClause {
419412
}
420413
}
421414

422-
impl Default for WhereClause {
423-
fn default() -> WhereClause {
424-
WhereClause { has_where_token: false, predicates: ThinVec::new(), span: DUMMY_SP }
425-
}
426-
}
427-
428415
/// A single predicate in a where-clause.
429416
#[derive(Clone, Encodable, Decodable, Debug)]
430417
pub struct WherePredicate {

‎compiler/rustc_ast/src/util/parser.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,10 @@ impl AssocOp {
153153
match *self {
154154
Assign | AssignOp(_) => Fixity::Right,
155155
As | Multiply | Divide | Modulus | Add | Subtract | ShiftLeft | ShiftRight | BitAnd
156-
| BitXor | BitOr | Less | Greater | LessEqual | GreaterEqual | Equal | NotEqual
157-
| LAnd | LOr => Fixity::Left,
158-
DotDot | DotDotEq => Fixity::None,
156+
| BitXor | BitOr | LAnd | LOr => Fixity::Left,
157+
Less | Greater | LessEqual | GreaterEqual | Equal | NotEqual | DotDot | DotDotEq => {
158+
Fixity::None
159+
}
159160
}
160161
}
161162

‎compiler/rustc_ast_passes/src/feature_gate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
263263
&self,
264264
negative_impls,
265265
span.to(of_trait.as_ref().map_or(span, |t| t.path.span)),
266-
"negative trait bounds are not yet fully implemented; \
266+
"negative trait bounds are not fully implemented; \
267267
use marker types for now"
268268
);
269269
}

‎compiler/rustc_ast_pretty/src/pprust/state.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,10 @@ impl<'a> State<'a> {
12041204
}
12051205
ast::TyKind::Path(Some(qself), path) => self.print_qpath(path, qself, false),
12061206
ast::TyKind::TraitObject(bounds, syntax) => {
1207-
if *syntax == ast::TraitObjectSyntax::Dyn {
1208-
self.word_nbsp("dyn");
1207+
match syntax {
1208+
ast::TraitObjectSyntax::Dyn => self.word_nbsp("dyn"),
1209+
ast::TraitObjectSyntax::DynStar => self.word_nbsp("dyn*"),
1210+
ast::TraitObjectSyntax::None => {}
12091211
}
12101212
self.print_type_bounds(bounds);
12111213
}

0 commit comments

Comments
 (0)