Skip to content

Commit 3e4a15e

Browse files
committedDec 20, 2023
Auto merge of #119156 - matthiaskrgr:rollup-482ow65, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #118691 (Add check for possible CStr literals in pre-2021) - #118973 (rustc_codegen_ssa: Don't drop `IncorrectCguReuseType` , make `rustc_expected_cgu_reuse` attr work) - #119071 (-Znext-solver: adapt overflow rules to avoid breakage) - #119089 (effects: fix a comment) - #119094 (Add function ABI and type layout to StableMIR) - #119102 (Add arm-none-eabi and armv7r-none-eabi platform-support documentation.) - #119107 (subtype_predicate: remove unnecessary probe) Failed merges: - #119135 (Fix crash due to `CrateItem::kind()` not handling constructors) - #119141 (Add method to get instance instantiation arguments) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3095d31 + d6656af commit 3e4a15e

Some content is hidden

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

47 files changed

+1419
-267
lines changed
 

‎compiler/rustc_codegen_ssa/src/assert_module_sources.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,13 @@ impl CguReuseTracker {
278278

279279
if error {
280280
let at_least = if at_least { 1 } else { 0 };
281-
errors::IncorrectCguReuseType {
281+
sess.emit_err(errors::IncorrectCguReuseType {
282282
span: *error_span,
283283
cgu_user_name,
284284
actual_reuse,
285285
expected_reuse,
286286
at_least,
287-
};
287+
});
288288
}
289289
} else {
290290
sess.emit_fatal(errors::CguNotRecorded { cgu_user_name, cgu_name });

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub fn create_args_for_parent_generic_args<'tcx, 'a>(
262262
// impl const PartialEq for () {}
263263
// ```
264264
//
265-
// Since this is a const impl, we need to insert `<false>` at the end of
265+
// Since this is a const impl, we need to insert a host arg at the end of
266266
// `PartialEq`'s generics, but this errors since `Rhs` isn't specified.
267267
// To work around this, we infer all arguments until we reach the host param.
268268
args.push(ctx.inferred_kind(Some(&args), param, infer_args));

0 commit comments

Comments
 (0)