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

Commit 98aa362

Browse files
borsbors
committed
Auto merge of rust-lang#120807 - matthiaskrgr:rollup-1pf3glu, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#120590 (Remove unused args from functions) - rust-lang#120750 (No need to take `ImplTraitContext` by ref) - rust-lang#120769 (make future diffs minimal) - rust-lang#120772 (Remove myself from review rotation.) - rust-lang#120775 (Make `min_exhaustive_patterns` match `exhaustive_patterns` better) - rust-lang#120778 (Deduplicate `tcx.instance_mir(instance)` calls in `try_instance_mir`) - rust-lang#120782 (Fix mir pass ICE in the presence of other errors) - rust-lang#120783 (Add release note for new ambiguous_wide_pointer_comparisons lint) - rust-lang#120801 (Avoid ICE in drop recursion check in case of invalid drop impls) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c29082f + ed52851 commit 98aa362

File tree

58 files changed

+357
-265
lines changed

Some content is hidden

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

58 files changed

+357
-265
lines changed

‎RELEASES.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Language
88
- [Document Rust ABI compatibility between various types](https://github.com/rust-lang/rust/pull/115476/)
99
- [Also: guarantee that char and u32 are ABI-compatible](https://github.com/rust-lang/rust/pull/118032/)
1010
- [Warn against ambiguous wide pointer comparisons](https://github.com/rust-lang/rust/pull/117758/)
11+
- [Add lint `ambiguous_wide_pointer_comparisons` that supersedes `clippy::vtable_address_comparisons`](https://github.com/rust-lang/rust/pull/117758)
1112

1213
<a id="1.76.0-Compiler"></a>
1314

‎compiler/rustc_ast_lowering/src/asm.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
205205
&sym.qself,
206206
&sym.path,
207207
ParamMode::Optional,
208-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
208+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
209209
None,
210210
);
211211
hir::InlineAsmOperand::SymStatic { path, def_id }

‎compiler/rustc_ast_lowering/src/block.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
8585
let ty = l
8686
.ty
8787
.as_ref()
88-
.map(|t| self.lower_ty(t, &ImplTraitContext::Disallowed(ImplTraitPosition::Variable)));
88+
.map(|t| self.lower_ty(t, ImplTraitContext::Disallowed(ImplTraitPosition::Variable)));
8989
let init = l.kind.init().map(|init| self.lower_expr(init));
9090
let hir_id = self.lower_node_id(l.id);
9191
let pat = self.lower_pat(&l.pat);

‎compiler/rustc_ast_lowering/src/delegation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
218218
&delegation.qself,
219219
&delegation.path,
220220
ParamMode::Optional,
221-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
221+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
222222
None,
223223
);
224224
let block = delegation.body.as_deref();

‎compiler/rustc_ast_lowering/src/expr.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
9999
seg,
100100
ParamMode::Optional,
101101
ParenthesizedGenericArgs::Err,
102-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
102+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
103103
None,
104104
// Method calls can't have bound modifiers
105105
None,
@@ -141,13 +141,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
141141
ExprKind::Cast(expr, ty) => {
142142
let expr = self.lower_expr(expr);
143143
let ty =
144-
self.lower_ty(ty, &ImplTraitContext::Disallowed(ImplTraitPosition::Cast));
144+
self.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::Cast));
145145
hir::ExprKind::Cast(expr, ty)
146146
}
147147
ExprKind::Type(expr, ty) => {
148148
let expr = self.lower_expr(expr);
149149
let ty =
150-
self.lower_ty(ty, &ImplTraitContext::Disallowed(ImplTraitPosition::Cast));
150+
self.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::Cast));
151151
hir::ExprKind::Type(expr, ty)
152152
}
153153
ExprKind::AddrOf(k, m, ohs) => {
@@ -267,7 +267,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
267267
qself,
268268
path,
269269
ParamMode::Optional,
270-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
270+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
271271
None,
272272
);
273273
hir::ExprKind::Path(qpath)
@@ -295,7 +295,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
295295
ExprKind::OffsetOf(container, fields) => hir::ExprKind::OffsetOf(
296296
self.lower_ty(
297297
container,
298-
&ImplTraitContext::Disallowed(ImplTraitPosition::OffsetOf),
298+
ImplTraitContext::Disallowed(ImplTraitPosition::OffsetOf),
299299
),
300300
self.arena.alloc_from_iter(fields.iter().map(|&ident| self.lower_ident(ident))),
301301
),
@@ -314,7 +314,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
314314
&se.qself,
315315
&se.path,
316316
ParamMode::Optional,
317-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
317+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
318318
None,
319319
)),
320320
self.arena
@@ -1241,7 +1241,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12411241
qself,
12421242
path,
12431243
ParamMode::Optional,
1244-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
1244+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
12451245
None,
12461246
);
12471247
// Destructure like a tuple struct.
@@ -1261,7 +1261,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12611261
qself,
12621262
path,
12631263
ParamMode::Optional,
1264-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
1264+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
12651265
None,
12661266
);
12671267
// Destructure like a unit struct.
@@ -1286,7 +1286,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
12861286
&se.qself,
12871287
&se.path,
12881288
ParamMode::Optional,
1289-
&ImplTraitContext::Disallowed(ImplTraitPosition::Path),
1289+
ImplTraitContext::Disallowed(ImplTraitPosition::Path),
12901290
None,
12911291
);
12921292
let fields_omitted = match &se.rest {

0 commit comments

Comments
 (0)