Skip to content

Commit da3f4c5

Browse files
borsbors
committed
Auto merge of rust-lang#120800 - matthiaskrgr:rollup-9vqhh6q, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang#113026 (Introduce `run-make` V2 infrastructure, a `run_make_support` library and port over 2 tests as example) - rust-lang#120589 (std::thread::available_parallelism merging linux/android/freebsd version) - rust-lang#120590 (Remove unused args from functions) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120693 (Invert diagnostic lints.) - rust-lang#120704 (A drive-by rewrite of `give_region_a_name()`) - rust-lang#120750 (No need to take `ImplTraitContext` by ref) - rust-lang#120765 (Reorder diagnostics API) - rust-lang#120772 (Remove myself from review rotation.) - rust-lang#120783 (Add release note for new ambiguous_wide_pointer_comparisons lint) Failed merges: - rust-lang#120782 (Fix mir pass ICE in the presence of other errors) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c29082f + aace69f commit da3f4c5

File tree

152 files changed

+1281
-853
lines changed

Some content is hidden

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

152 files changed

+1281
-853
lines changed

‎Cargo.lock

+13
Original file line numberDiff line numberDiff line change
@@ -3258,6 +3258,13 @@ dependencies = [
32583258
"serde_json",
32593259
]
32603260

3261+
[[package]]
3262+
name = "run_make_support"
3263+
version = "0.0.0"
3264+
dependencies = [
3265+
"shell-words",
3266+
]
3267+
32613268
[[package]]
32623269
name = "rust-demangler"
32633270
version = "0.0.1"
@@ -4968,6 +4975,12 @@ version = "0.1.5"
49684975
source = "registry+https://github.com./rust-lang/crates.io-index"
49694976
checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
49704977

4978+
[[package]]
4979+
name = "shell-words"
4980+
version = "1.1.0"
4981+
source = "registry+https://github.com./rust-lang/crates.io-index"
4982+
checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
4983+
49714984
[[package]]
49724985
name = "shlex"
49734986
version = "1.1.0"

‎Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ members = [
1010
"src/tools/clippy",
1111
"src/tools/clippy/clippy_dev",
1212
"src/tools/compiletest",
13+
"src/tools/run-make-support",
1314
"src/tools/error_index_generator",
1415
"src/tools/linkchecker",
1516
"src/tools/lint-docs",

‎RELEASES.md

+1
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_arena/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#![cfg_attr(test, feature(test))]
2323
#![feature(strict_provenance)]
2424
#![deny(unsafe_op_in_unsafe_fn)]
25-
#![deny(rustc::untranslatable_diagnostic)]
26-
#![deny(rustc::diagnostic_outside_of_impl)]
2725
#![allow(internal_features)]
2826
#![allow(clippy::mut_from_ref)] // Arena allocators are one of the places where this pattern is fine.
2927

‎compiler/rustc_ast/src/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#![feature(min_specialization)]
1919
#![feature(negative_impls)]
2020
#![feature(stmt_expr_attributes)]
21-
#![deny(rustc::untranslatable_diagnostic)]
22-
#![deny(rustc::diagnostic_outside_of_impl)]
2321

2422
#[macro_use]
2523
extern crate rustc_macros;

‎compiler/rustc_ast_lowering/src/asm.rs

+1-1
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

+1-1
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

+1-1
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

+9-9
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)