Skip to content

Commit 236ac91

Browse files
borsbors
committed
Auto merge of #117405 - GuillaumeGomez:rollup-i3jxtwh, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #112463 (rustdoc: elide cross-crate default generic arguments) - #117068 (Clean up `compiler/rustc*/Cargo.toml`) - #117132 (On object safety error, mention new enum as alternative) - #117317 (share some track_caller logic between interpret and codegen) - #117356 (Add support for mipsel-unknown-netbsd, 32-bit LE mips.) - #117357 (Rename a few remaining references to abort terminator) - #117370 (C-variadic error improvements) - #117376 (More `rustc_interface` cleanups) - #117383 (improve and fix `x install`) - #117390 (Fix unused variables lint issue for args in macro) - #117395 (Fix missing leading space in suggestion) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e6e931d + 9e4ab9f commit 236ac91

File tree

145 files changed

+1651
-1079
lines changed

Some content is hidden

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

145 files changed

+1651
-1079
lines changed

‎Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -4412,7 +4412,6 @@ version = "0.0.0"
44124412
dependencies = [
44134413
"field-offset",
44144414
"measureme",
4415-
"memoffset",
44164415
"rustc-rayon-core",
44174416
"rustc_data_structures",
44184417
"rustc_errors",

‎compiler/rustc/Cargo.toml

+10-3
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,31 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
rustc_driver = { path = "../rustc_driver" }
8-
rustc_driver_impl = { path = "../rustc_driver_impl" }
7+
# tidy-alphabetical-start
98

109
# Make sure rustc_codegen_ssa ends up in the sysroot, because this
1110
# crate is intended to be used by codegen backends, which may not be in-tree.
1211
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
12+
13+
rustc_driver = { path = "../rustc_driver" }
14+
rustc_driver_impl = { path = "../rustc_driver_impl" }
15+
1316
# Make sure rustc_smir ends up in the sysroot, because this
14-
# crate is intended to be used by stable MIR consumers, which are not in-tree
17+
# crate is intended to be used by stable MIR consumers, which are not in-tree.
1518
rustc_smir = { path = "../rustc_smir" }
19+
1620
stable_mir = { path = "../stable_mir" }
21+
# tidy-alphabetical-end
1722

1823
[dependencies.jemalloc-sys]
1924
version = "0.5.0"
2025
optional = true
2126
features = ['unprefixed_malloc_on_supported_platforms']
2227

2328
[features]
29+
# tidy-alphabetical-start
2430
jemalloc = ['jemalloc-sys']
2531
llvm = ['rustc_driver_impl/llvm']
2632
max_level_info = ['rustc_driver_impl/max_level_info']
2733
rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler']
34+
# tidy-alphabetical-end

‎compiler/rustc_abi/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
bitflags = "1.2.1"
8-
tracing = "0.1"
99
rand = { version = "0.8.4", default-features = false, optional = true }
1010
rand_xoshiro = { version = "0.6.0", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
1212
rustc_index = { path = "../rustc_index", default-features = false }
1313
rustc_macros = { path = "../rustc_macros", optional = true }
1414
rustc_serialize = { path = "../rustc_serialize", optional = true }
15+
tracing = "0.1"
16+
# tidy-alphabetical-end
1517

1618
[features]
19+
# tidy-alphabetical-start
1720
default = ["nightly", "randomize"]
18-
randomize = ["rand", "rand_xoshiro", "nightly"]
1921
# rust-analyzer depends on this crate and we therefore require it to built on a stable toolchain
2022
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
2123
nightly = [
@@ -24,3 +26,5 @@ nightly = [
2426
"rustc_macros",
2527
"rustc_serialize",
2628
]
29+
randomize = ["rand", "rand_xoshiro", "nightly"]
30+
# tidy-alphabetical-end

‎compiler/rustc_arena/Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
9+
# tidy-alphabetical-end

‎compiler/rustc_ast/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ name = "rustc_ast"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
bitflags = "1.2.1"
109
memchr = "2.5.0"
1110
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -14,8 +13,9 @@ rustc_lexer = { path = "../rustc_lexer" }
1413
rustc_macros = { path = "../rustc_macros" }
1514
rustc_serialize = { path = "../rustc_serialize" }
1615
rustc_span = { path = "../rustc_span" }
17-
# depends on Mutability and Movability, which could be uplifted into a common crate.
16+
# For Mutability and Movability, which could be uplifted into a common crate.
1817
rustc_type_ir = { path = "../rustc_type_ir" }
1918
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2019
thin-vec = "0.2.12"
2120
tracing = "0.1"
21+
# tidy-alphabetical-end

‎compiler/rustc_ast_lowering/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ edition = "2021"
77
doctest = false
88

99
[dependencies]
10+
# tidy-alphabetical-start
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1213
rustc_data_structures = { path = "../rustc_data_structures" }
1314
rustc_errors = { path = "../rustc_errors" }
14-
rustc_hir = { path = "../rustc_hir" }
1515
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
16+
rustc_hir = { path = "../rustc_hir" }
1617
rustc_index = { path = "../rustc_index" }
17-
rustc_middle = { path = "../rustc_middle" }
1818
rustc_macros = { path = "../rustc_macros" }
19+
rustc_middle = { path = "../rustc_middle" }
1920
rustc_session = { path = "../rustc_session" }
2021
rustc_span = { path = "../rustc_span" }
2122
rustc_target = { path = "../rustc_target" }
2223
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2324
thin-vec = "0.2.12"
2425
tracing = "0.1"
26+
# tidy-alphabetical-end

‎compiler/rustc_ast_passes/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
itertools = "0.10.1"
89
rustc_ast = { path = "../rustc_ast" }
910
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1011
rustc_attr = { path = "../rustc_attr" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }
1213
rustc_errors = { path = "../rustc_errors" }
1314
rustc_feature = { path = "../rustc_feature" }
14-
rustc_macros = { path = "../rustc_macros" }
1515
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
16+
rustc_macros = { path = "../rustc_macros" }
1617
rustc_parse = { path = "../rustc_parse" }
1718
rustc_session = { path = "../rustc_session" }
1819
rustc_span = { path = "../rustc_span" }
1920
rustc_target = { path = "../rustc_target" }
2021
thin-vec = "0.2.12"
2122
tracing = "0.1"
23+
# tidy-alphabetical-end

‎compiler/rustc_ast_passes/messages.ftl

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ ast_passes_const_and_async = functions cannot be both `const` and `async`
4242
.async = `async` because of this
4343
.label = {""}
4444
45+
ast_passes_const_and_c_variadic = functions cannot be both `const` and C-variadic
46+
.const = `const` because of this
47+
.variadic = C-variadic because of this
48+
4549
ast_passes_const_without_body =
4650
free constant item without body
4751
.suggestion = provide a definition for the constant

‎compiler/rustc_ast_passes/src/ast_validation.rs

+30-7
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,36 @@ impl<'a> AstValidator<'a> {
482482
}
483483
}
484484

485-
/// Reject C-variadic type unless the function is foreign,
486-
/// or free and `unsafe extern "C"` semantically.
485+
/// Reject invalid C-variadic types.
486+
///
487+
/// C-variadics must be:
488+
/// - Non-const
489+
/// - Either foreign, or free and `unsafe extern "C"` semantically
487490
fn check_c_variadic_type(&self, fk: FnKind<'a>) {
491+
let variadic_spans: Vec<_> = fk
492+
.decl()
493+
.inputs
494+
.iter()
495+
.filter(|arg| matches!(arg.ty.kind, TyKind::CVarArgs))
496+
.map(|arg| arg.span)
497+
.collect();
498+
499+
if variadic_spans.is_empty() {
500+
return;
501+
}
502+
503+
if let Some(header) = fk.header() {
504+
if let Const::Yes(const_span) = header.constness {
505+
let mut spans = variadic_spans.clone();
506+
spans.push(const_span);
507+
self.err_handler().emit_err(errors::ConstAndCVariadic {
508+
spans,
509+
const_span,
510+
variadic_spans: variadic_spans.clone(),
511+
});
512+
}
513+
}
514+
488515
match (fk.ctxt(), fk.header()) {
489516
(Some(FnCtxt::Foreign), _) => return,
490517
(Some(FnCtxt::Free), Some(header)) => match header.ext {
@@ -499,11 +526,7 @@ impl<'a> AstValidator<'a> {
499526
_ => {}
500527
};
501528

502-
for Param { ty, span, .. } in &fk.decl().inputs {
503-
if let TyKind::CVarArgs = ty.kind {
504-
self.err_handler().emit_err(errors::BadCVariadic { span: *span });
505-
}
506-
}
529+
self.err_handler().emit_err(errors::BadCVariadic { span: variadic_spans });
507530
}
508531

509532
fn check_item_named(&self, ident: Ident, kind: &str) {

‎compiler/rustc_ast_passes/src/errors.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ pub struct ExternItemAscii {
271271
#[diag(ast_passes_bad_c_variadic)]
272272
pub struct BadCVariadic {
273273
#[primary_span]
274-
pub span: Span,
274+
pub span: Vec<Span>,
275275
}
276276

277277
#[derive(Diagnostic)]
@@ -583,6 +583,17 @@ pub struct ConstAndAsync {
583583
pub span: Span,
584584
}
585585

586+
#[derive(Diagnostic)]
587+
#[diag(ast_passes_const_and_c_variadic)]
588+
pub struct ConstAndCVariadic {
589+
#[primary_span]
590+
pub spans: Vec<Span>,
591+
#[label(ast_passes_const)]
592+
pub const_span: Span,
593+
#[label(ast_passes_variadic)]
594+
pub variadic_spans: Vec<Span>,
595+
}
596+
586597
#[derive(Diagnostic)]
587598
#[diag(ast_passes_pattern_in_foreign, code = "E0130")]
588599
pub struct PatternInForeign {

‎compiler/rustc_ast_pretty/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name = "rustc_ast_pretty"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
rustc_ast = { path = "../rustc_ast" }
109
rustc_span = { path = "../rustc_span" }
1110
thin-vec = "0.2.12"
11+
# tidy-alphabetical-end

‎compiler/rustc_attr/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ name = "rustc_attr"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
rustc_ast = { path = "../rustc_ast" }
109
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1110
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -17,3 +16,4 @@ rustc_macros = { path = "../rustc_macros" }
1716
rustc_serialize = { path = "../rustc_serialize" }
1817
rustc_session = { path = "../rustc_session" }
1918
rustc_span = { path = "../rustc_span" }
19+
# tidy-alphabetical-end

‎compiler/rustc_baked_icu_data/Cargo.toml

+4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@ version = "0.0.0"
44
edition = "2021"
55

66
[dependencies]
7+
# tidy-alphabetical-start
78
icu_list = "1.2"
89
icu_locid = "1.2"
910
icu_provider = "1.2"
1011
icu_provider_adapters = "1.2"
1112
zerovec = "0.9.4"
13+
# tidy-alphabetical-end
1214

1315
[features]
16+
# tidy-alphabetical-start
1417
rustc_use_parallel_compiler = ['icu_provider/sync']
18+
# tidy-alphabetical-end

‎compiler/rustc_borrowck/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@ name = "rustc_borrowck"
33
version = "0.0.0"
44
edition = "2021"
55

6-
[lib]
7-
86
[dependencies]
7+
# tidy-alphabetical-start
98
either = "1.5.0"
109
itertools = "0.10.1"
11-
tracing = "0.1"
1210
polonius-engine = "0.13.0"
13-
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1411
rustc_data_structures = { path = "../rustc_data_structures" }
1512
rustc_errors = { path = "../rustc_errors" }
13+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1614
rustc_graphviz = { path = "../rustc_graphviz" }
1715
rustc_hir = { path = "../rustc_hir" }
18-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1916
rustc_index = { path = "../rustc_index" }
2017
rustc_infer = { path = "../rustc_infer" }
2118
rustc_lexer = { path = "../rustc_lexer" }
@@ -24,7 +21,10 @@ rustc_middle = { path = "../rustc_middle" }
2421
rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
2522
rustc_serialize = { path = "../rustc_serialize" }
2623
rustc_session = { path = "../rustc_session" }
24+
rustc_span = { path = "../rustc_span" }
2725
rustc_target = { path = "../rustc_target" }
2826
rustc_trait_selection = { path = "../rustc_trait_selection" }
2927
rustc_traits = { path = "../rustc_traits" }
30-
rustc_span = { path = "../rustc_span" }
28+
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
29+
tracing = "0.1"
30+
# tidy-alphabetical-end

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1640,7 +1640,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
16401640
}
16411641
TerminatorKind::UnwindTerminate(_) => {
16421642
if !is_cleanup {
1643-
span_mirbug!(self, block_data, "abort on non-cleanup block!")
1643+
span_mirbug!(self, block_data, "terminate on non-cleanup block!")
16441644
}
16451645
}
16461646
TerminatorKind::Return => {

‎compiler/rustc_builtin_macros/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,25 @@ edition = "2021"
77
doctest = false
88

99
[dependencies]
10+
# tidy-alphabetical-start
1011
rustc_ast = { path = "../rustc_ast" }
1112
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1213
rustc_attr = { path = "../rustc_attr" }
1314
rustc_data_structures = { path = "../rustc_data_structures" }
1415
rustc_errors = { path = "../rustc_errors" }
1516
rustc_expand = { path = "../rustc_expand" }
1617
rustc_feature = { path = "../rustc_feature" }
18+
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
1719
rustc_index = { path = "../rustc_index" }
1820
rustc_lexer = { path = "../rustc_lexer" }
1921
rustc_lint_defs = { path = "../rustc_lint_defs" }
2022
rustc_macros = { path = "../rustc_macros" }
21-
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
22-
rustc_parse_format = { path = "../rustc_parse_format" }
2323
rustc_parse = { path = "../rustc_parse" }
24+
rustc_parse_format = { path = "../rustc_parse_format" }
2425
rustc_session = { path = "../rustc_session" }
2526
rustc_span = { path = "../rustc_span" }
2627
rustc_target = { path = "../rustc_target" }
2728
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2829
thin-vec = "0.2.12"
2930
tracing = "0.1"
31+
# tidy-alphabetical-end

0 commit comments

Comments
 (0)