Skip to content

Commit d186e16

Browse files
borsbors
committed
Auto merge of #129802 - workingjubilee:rollup-kjgatqm, r=workingjubilee
Rollup of 16 pull requests Successful merges: - #129123 (rustdoc-json: Add test for `Self` type) - #129675 (allow BufReader::peek to be called on unsized types) - #129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver) - #129723 (Simplify some extern providers) - #129724 (Remove `Option<!>` return types.) - #129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries) - #129730 (f32 docs: define 'arithmetic' operations) - #129749 (llvm-wrapper: adapt for LLVM API changes) - #129757 (Add a test for trait solver overflow in MIR inliner cycle detection) - #129760 (Make the "detect-old-time" UI test more representative) - #129762 (Update the `wasm-component-ld` binary dependency) - #129767 (Remove `#[macro_use] extern crate tracing`, round 4) - #129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt) - #129780 (add crashtests for several old unfixed ICEs) - #129782 (couple more crash tests) - #129791 (mark joboet as on vacation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fa72f07 + a06e44b commit d186e16

File tree

300 files changed

+862
-318
lines changed

Some content is hidden

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

300 files changed

+862
-318
lines changed

‎Cargo.lock

+32-23
Original file line numberDiff line numberDiff line change
@@ -2463,7 +2463,7 @@ dependencies = [
24632463
"indexmap",
24642464
"memchr",
24652465
"ruzstd 0.7.0",
2466-
"wasmparser",
2466+
"wasmparser 0.215.0",
24672467
]
24682468

24692469
[[package]]
@@ -3133,7 +3133,7 @@ dependencies = [
31333133
"regex",
31343134
"serde_json",
31353135
"similar",
3136-
"wasmparser",
3136+
"wasmparser 0.216.0",
31373137
]
31383138

31393139
[[package]]
@@ -5779,9 +5779,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
57795779

57805780
[[package]]
57815781
name = "wasi-preview1-component-adapter-provider"
5782-
version = "23.0.2"
5782+
version = "24.0.0"
57835783
source = "registry+https://github.com/rust-lang/crates.io-index"
5784-
checksum = "f91d3d13afef569b9fc80cfbb807c87c16ef49bd3ac1a93285ea6a264b600d2d"
5784+
checksum = "36e6cadfa74538edd5409b6f8c79628436529138e9618b7373bec7aae7805835"
57855785

57865786
[[package]]
57875787
name = "wasm-bindgen"
@@ -5840,16 +5840,16 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
58405840

58415841
[[package]]
58425842
name = "wasm-component-ld"
5843-
version = "0.5.6"
5843+
version = "0.5.7"
58445844
source = "registry+https://github.com/rust-lang/crates.io-index"
5845-
checksum = "51449c63d1ce69f92b8465a084ed5b91f1a7eb583fa95796650a6bfcffc4f9cb"
5845+
checksum = "13261270d3ac58ffae0219ae34f297a7e24f9ee3b13b29be579132c588a83519"
58465846
dependencies = [
58475847
"anyhow",
58485848
"clap",
58495849
"lexopt",
58505850
"tempfile",
58515851
"wasi-preview1-component-adapter-provider",
5852-
"wasmparser",
5852+
"wasmparser 0.216.0",
58535853
"wat",
58545854
"wit-component",
58555855
"wit-parser",
@@ -5864,19 +5864,19 @@ dependencies = [
58645864

58655865
[[package]]
58665866
name = "wasm-encoder"
5867-
version = "0.215.0"
5867+
version = "0.216.0"
58685868
source = "registry+https://github.com/rust-lang/crates.io-index"
5869-
checksum = "4fb56df3e06b8e6b77e37d2969a50ba51281029a9aeb3855e76b7f49b6418847"
5869+
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
58705870
dependencies = [
58715871
"leb128",
5872-
"wasmparser",
5872+
"wasmparser 0.216.0",
58735873
]
58745874

58755875
[[package]]
58765876
name = "wasm-metadata"
5877-
version = "0.215.0"
5877+
version = "0.216.0"
58785878
source = "registry+https://github.com/rust-lang/crates.io-index"
5879-
checksum = "0c6bb07c5576b608f7a2a9baa2294c1a3584a249965d695a9814a496cb6d232f"
5879+
checksum = "47c8154d703a6b0e45acf6bd172fa002fc3c7058a9f7615e517220aeca27c638"
58805880
dependencies = [
58815881
"anyhow",
58825882
"indexmap",
@@ -5885,14 +5885,23 @@ dependencies = [
58855885
"serde_json",
58865886
"spdx",
58875887
"wasm-encoder",
5888-
"wasmparser",
5888+
"wasmparser 0.216.0",
58895889
]
58905890

58915891
[[package]]
58925892
name = "wasmparser"
58935893
version = "0.215.0"
58945894
source = "registry+https://github.com/rust-lang/crates.io-index"
58955895
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
5896+
dependencies = [
5897+
"bitflags 2.6.0",
5898+
]
5899+
5900+
[[package]]
5901+
name = "wasmparser"
5902+
version = "0.216.0"
5903+
source = "registry+https://github.com/rust-lang/crates.io-index"
5904+
checksum = "bcdee6bea3619d311fb4b299721e89a986c3470f804b6d534340e412589028e3"
58965905
dependencies = [
58975906
"ahash",
58985907
"bitflags 2.6.0",
@@ -5904,9 +5913,9 @@ dependencies = [
59045913

59055914
[[package]]
59065915
name = "wast"
5907-
version = "215.0.0"
5916+
version = "216.0.0"
59085917
source = "registry+https://github.com/rust-lang/crates.io-index"
5909-
checksum = "1ff1d00d893593249e60720be04a7c1f42f1c4dc3806a2869f4e66ab61eb54cb"
5918+
checksum = "f7eb1f2eecd913fdde0dc6c3439d0f24530a98ac6db6cb3d14d92a5328554a08"
59105919
dependencies = [
59115920
"bumpalo",
59125921
"leb128",
@@ -5917,9 +5926,9 @@ dependencies = [
59175926

59185927
[[package]]
59195928
name = "wat"
5920-
version = "1.215.0"
5929+
version = "1.216.0"
59215930
source = "registry+https://github.com/rust-lang/crates.io-index"
5922-
checksum = "670bf4d9c8cf76ae242d70ded47c546525b6dafaa6871f9bcb065344bf2b4e3d"
5931+
checksum = "ac0409090fb5154f95fb5ba3235675fd9e579e731524d63b6a2f653e1280c82a"
59235932
dependencies = [
59245933
"wast",
59255934
]
@@ -6206,9 +6215,9 @@ dependencies = [
62066215

62076216
[[package]]
62086217
name = "wit-component"
6209-
version = "0.215.0"
6218+
version = "0.216.0"
62106219
source = "registry+https://github.com/rust-lang/crates.io-index"
6211-
checksum = "f725e3885fc5890648be5c5cbc1353b755dc932aa5f1aa7de968b912a3280743"
6220+
checksum = "7e2ca3ece38ea2447a9069b43074ba73d96dde1944cba276c54e41371745f9dc"
62126221
dependencies = [
62136222
"anyhow",
62146223
"bitflags 2.6.0",
@@ -6219,15 +6228,15 @@ dependencies = [
62196228
"serde_json",
62206229
"wasm-encoder",
62216230
"wasm-metadata",
6222-
"wasmparser",
6231+
"wasmparser 0.216.0",
62236232
"wit-parser",
62246233
]
62256234

62266235
[[package]]
62276236
name = "wit-parser"
6228-
version = "0.215.0"
6237+
version = "0.216.0"
62296238
source = "registry+https://github.com/rust-lang/crates.io-index"
6230-
checksum = "935a97eaffd57c3b413aa510f8f0b550a4a9fe7d59e79cd8b89a83dcb860321f"
6239+
checksum = "a4d108165c1167a4ccc8a803dcf5c28e0a51d6739fd228cc7adce768632c764c"
62316240
dependencies = [
62326241
"anyhow",
62336242
"id-arena",
@@ -6238,7 +6247,7 @@ dependencies = [
62386247
"serde_derive",
62396248
"serde_json",
62406249
"unicode-xid",
6241-
"wasmparser",
6250+
"wasmparser 0.216.0",
62426251
]
62436252

62446253
[[package]]

‎compiler/rustc_borrowck/src/borrow_set.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_middle::mir::{self, traversal, Body, Local, Location};
88
use rustc_middle::span_bug;
99
use rustc_middle::ty::{RegionVid, TyCtxt};
1010
use rustc_mir_dataflow::move_paths::MoveData;
11+
use tracing::debug;
1112

1213
use crate::path_utils::allow_two_phase_borrow;
1314
use crate::place_ext::PlaceExt;

‎compiler/rustc_borrowck/src/constraints/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use rustc_index::{IndexSlice, IndexVec};
55
use rustc_middle::mir::ConstraintCategory;
66
use rustc_middle::ty::{RegionVid, TyCtxt, VarianceDiagInfo};
77
use rustc_span::Span;
8+
use tracing::{debug, instrument};
89

910
use crate::region_infer::{ConstraintSccs, RegionDefinition, RegionTracker};
1011
use crate::type_check::Locations;

‎compiler/rustc_borrowck/src/dataflow.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_middle::ty::{RegionVid, TyCtxt};
1010
use rustc_mir_dataflow::fmt::DebugWithContext;
1111
use rustc_mir_dataflow::impls::{EverInitializedPlaces, MaybeUninitializedPlaces};
1212
use rustc_mir_dataflow::{Analysis, AnalysisDomain, GenKill, Results, ResultsVisitable};
13+
use tracing::debug;
1314

1415
use crate::{places_conflict, BorrowSet, PlaceConflictBias, PlaceExt, RegionInferenceContext};
1516

‎compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
1919
use rustc_trait_selection::traits::query::type_op;
2020
use rustc_trait_selection::traits::ObligationCtxt;
2121
use rustc_traits::{type_op_ascribe_user_type_with_span, type_op_prove_predicate_with_cause};
22+
use tracing::{debug, instrument};
2223

2324
use crate::region_infer::values::RegionElement;
2425
use crate::session_diagnostics::{

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
4040
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
4141
use rustc_trait_selection::infer::InferCtxtExt;
4242
use rustc_trait_selection::traits::{Obligation, ObligationCause, ObligationCtxt};
43+
use tracing::{debug, instrument};
4344

4445
use super::explain_borrow::{BorrowExplanation, LaterUseKind};
4546
use super::{DescribePlaceOpt, RegionName, RegionNameSource, UseSpans};

‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_middle::ty::{self, RegionVid, Ty, TyCtxt};
2020
use rustc_span::symbol::{kw, Symbol};
2121
use rustc_span::{sym, DesugaringKind, Span};
2222
use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
23+
use tracing::{debug, instrument};
2324

2425
use super::{find_use, RegionName, UseSpans};
2526
use crate::borrow_set::BorrowData;

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use rustc_trait_selection::infer::InferCtxtExt;
2727
use rustc_trait_selection::traits::{
2828
type_known_to_meet_bound_modulo_regions, FulfillmentErrorCode,
2929
};
30+
use tracing::debug;
3031

3132
use super::borrow_set::BorrowData;
3233
use super::MirBorrowckCtxt;

‎compiler/rustc_borrowck/src/diagnostics/move_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_middle::ty::{self, Ty};
1010
use rustc_mir_dataflow::move_paths::{LookupResult, MovePathIndex};
1111
use rustc_span::{BytePos, ExpnKind, MacroKind, Span};
1212
use rustc_trait_selection::error_reporting::traits::FindExprBySpan;
13+
use tracing::debug;
1314

1415
use crate::diagnostics::{CapturedMessageOpt, DescribePlaceOpt, UseSpans};
1516
use crate::prefixes::PrefixSet;

‎compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_target::abi::FieldIdx;
2020
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2121
use rustc_trait_selection::infer::InferCtxtExt;
2222
use rustc_trait_selection::traits;
23+
use tracing::debug;
2324

2425
use crate::diagnostics::BorrowedContentSource;
2526
use crate::util::FindAssignments;

‎compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_data_structures::fx::FxIndexSet;
1010
use rustc_errors::Diag;
1111
use rustc_middle::ty::RegionVid;
1212
use smallvec::SmallVec;
13+
use tracing::debug;
1314

1415
use super::{ErrorConstraintInfo, RegionName, RegionNameSource};
1516
use crate::MirBorrowckCtxt;

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use rustc_trait_selection::error_reporting::infer::region::unexpected_hidden_reg
2525
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
2626
use rustc_trait_selection::infer::InferCtxtExt;
2727
use rustc_trait_selection::traits::{Obligation, ObligationCtxt};
28+
use tracing::{debug, instrument, trace};
2829

2930
use super::{OutlivesSuggestionBuilder, RegionName, RegionNameSource};
3031
use crate::nll::ConstraintDescription;

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use rustc_middle::{bug, span_bug};
1414
use rustc_span::symbol::{kw, sym, Symbol};
1515
use rustc_span::{Span, DUMMY_SP};
1616
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
17+
use tracing::{debug, instrument};
1718

1819
use crate::universal_regions::DefiningTy;
1920
use crate::MirBorrowckCtxt;

‎compiler/rustc_borrowck/src/diagnostics/var_name.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use rustc_middle::mir::{Body, Local};
33
use rustc_middle::ty::{self, RegionVid, TyCtxt};
44
use rustc_span::symbol::Symbol;
55
use rustc_span::Span;
6+
use tracing::debug;
67

78
use crate::region_infer::RegionInferenceContext;
89

‎compiler/rustc_borrowck/src/lib.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
#![warn(unreachable_pub)]
1616
// tidy-alphabetical-end
1717

18-
#[macro_use]
19-
extern crate tracing;
20-
2118
use std::cell::RefCell;
2219
use std::collections::BTreeMap;
2320
use std::marker::PhantomData;
@@ -51,6 +48,7 @@ use rustc_session::lint::builtin::UNUSED_MUT;
5148
use rustc_span::{Span, Symbol};
5249
use rustc_target::abi::FieldIdx;
5350
use smallvec::SmallVec;
51+
use tracing::{debug, instrument};
5452

5553
use self::diagnostics::{AccessKind, IllegalMoveOriginKind, MoveError, RegionName};
5654
use self::location::LocationTable;

‎compiler/rustc_borrowck/src/location.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use rustc_index::IndexVec;
22
use rustc_middle::mir::{BasicBlock, Body, Location};
3+
use tracing::debug;
34

45
/// Maps between a MIR Location, which identifies a particular
56
/// statement within a basic block, to a "rich location", which

‎compiler/rustc_borrowck/src/member_constraints.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_index::{IndexSlice, IndexVec};
77
use rustc_middle::infer::MemberConstraint;
88
use rustc_middle::ty::{self, Ty};
99
use rustc_span::Span;
10+
use tracing::debug;
1011

1112
/// Compactly stores a set of `R0 member of [R1...Rn]` constraints,
1213
/// indexed by the region `R0`.

‎compiler/rustc_borrowck/src/nll.rs

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_mir_dataflow::move_paths::MoveData;
2020
use rustc_mir_dataflow::points::DenseLocationMap;
2121
use rustc_mir_dataflow::ResultsCursor;
2222
use rustc_span::symbol::sym;
23+
use tracing::{debug, instrument};
2324

2425
use crate::borrow_set::BorrowSet;
2526
use crate::consumers::ConsumerOptions;

‎compiler/rustc_borrowck/src/path_utils.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use rustc_data_structures::graph::dominators::Dominators;
22
use rustc_middle::mir::{BasicBlock, Body, BorrowKind, Location, Place, PlaceRef, ProjectionElem};
33
use rustc_middle::ty::TyCtxt;
44
use rustc_target::abi::FieldIdx;
5+
use tracing::debug;
56

67
use crate::borrow_set::{BorrowData, BorrowSet, TwoPhaseActivation};
78
use crate::{places_conflict, AccessDepth, BorrowIndex};

‎compiler/rustc_borrowck/src/place_ext.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use rustc_hir as hir;
22
use rustc_macros::extension;
33
use rustc_middle::mir::{Body, Mutability, Place, ProjectionElem};
44
use rustc_middle::ty::{self, TyCtxt};
5+
use tracing::debug;
56

67
use crate::borrow_set::LocalsStateAtExit;
78

‎compiler/rustc_borrowck/src/places_conflict.rs

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ use rustc_middle::mir::{
5959
Body, BorrowKind, FakeBorrowKind, MutBorrowKind, Place, PlaceElem, PlaceRef, ProjectionElem,
6060
};
6161
use rustc_middle::ty::{self, TyCtxt};
62+
use tracing::{debug, instrument};
6263

6364
use crate::{AccessDepth, ArtificialField, Deep, Overlap, Shallow};
6465

‎compiler/rustc_borrowck/src/polonius/loan_invalidations.rs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_middle::mir::{
77
TerminatorKind,
88
};
99
use rustc_middle::ty::TyCtxt;
10+
use tracing::debug;
1011

1112
use crate::borrow_set::BorrowSet;
1213
use crate::facts::AllFacts;

‎compiler/rustc_borrowck/src/polonius/loan_kills.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use rustc_middle::mir::{
44
Terminator, TerminatorKind,
55
};
66
use rustc_middle::ty::TyCtxt;
7+
use tracing::debug;
78

89
use crate::borrow_set::BorrowSet;
910
use crate::facts::AllFacts;

‎compiler/rustc_borrowck/src/polonius/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use rustc_middle::mir::{Body, LocalKind, Location, START_BLOCK};
77
use rustc_middle::ty::TyCtxt;
88
use rustc_mir_dataflow::move_paths::{InitKind, InitLocation, MoveData};
9+
use tracing::debug;
910

1011
use crate::borrow_set::BorrowSet;
1112
use crate::facts::{AllFacts, PoloniusRegionVid};

‎compiler/rustc_borrowck/src/region_infer/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
2121
use rustc_middle::ty::{self, RegionVid, Ty, TyCtxt, TypeFoldable, UniverseIndex};
2222
use rustc_mir_dataflow::points::DenseLocationMap;
2323
use rustc_span::Span;
24+
use tracing::{debug, instrument, trace};
2425

2526
use crate::constraints::graph::{self, NormalConstraintGraph, RegionGraph};
2627
use crate::constraints::{ConstraintSccIndex, OutlivesConstraint, OutlivesConstraintSet};

‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use rustc_middle::ty::{
1313
use rustc_span::Span;
1414
use rustc_trait_selection::error_reporting::InferCtxtErrorExt;
1515
use rustc_trait_selection::traits::ObligationCtxt;
16+
use tracing::{debug, instrument};
1617

1718
use super::RegionInferenceContext;
1819
use crate::session_diagnostics::{LifetimeMismatchOpaqueParam, NonGenericOpaqueTypeParam};

‎compiler/rustc_borrowck/src/region_infer/values.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use rustc_index::Idx;
88
use rustc_middle::mir::{BasicBlock, Location};
99
use rustc_middle::ty::{self, RegionVid};
1010
use rustc_mir_dataflow::points::{DenseLocationMap, PointIndex};
11+
use tracing::debug;
1112

1213
use crate::BorrowIndex;
1314

‎compiler/rustc_borrowck/src/renumber.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use rustc_middle::mir::visit::{MutVisitor, TyContext};
44
use rustc_middle::mir::{Body, ConstOperand, Location, Promoted};
55
use rustc_middle::ty::{self, GenericArgsRef, Ty, TyCtxt, TypeFoldable};
66
use rustc_span::Symbol;
7+
use tracing::{debug, instrument};
78

89
use crate::BorrowckInferCtxt;
910

‎compiler/rustc_borrowck/src/type_check/canonical.rs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_span::Span;
1010
use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;
1111
use rustc_trait_selection::traits::query::type_op::{self, TypeOpOutput};
1212
use rustc_trait_selection::traits::ObligationCause;
13+
use tracing::{debug, instrument};
1314

1415
use super::{Locations, NormalizeLocation, TypeChecker};
1516
use crate::diagnostics::ToUniverseInfo;

0 commit comments

Comments
 (0)