Skip to content

Commit 3137f8e

Browse files
borsbors
committed
Auto merge of rust-lang#72516 - Dylan-DPC:rollup-cc4w96z, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - rust-lang#71618 (Preserve substitutions when making trait obligations for suggestions) - rust-lang#72092 (Unblock font loading in rustdoc.css) - rust-lang#72400 (Add missing ASM arena declarations to librustc_middle) - rust-lang#72489 (Fix ice-72487) - rust-lang#72502 (fix discriminant type in generator transform) Failed merges: r? @ghost
2 parents 4774f9b + 1e79144 commit 3137f8e

File tree

12 files changed

+122
-59
lines changed

12 files changed

+122
-59
lines changed

‎src/librustc_middle/arena.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ macro_rules! arena_types {
7676
[few] hir_definitions: rustc_hir::definitions::Definitions,
7777
[] hir_owner: rustc_middle::hir::Owner<$tcx>,
7878
[] hir_owner_nodes: rustc_middle::hir::OwnerNodes<$tcx>,
79+
80+
// Note that this deliberately duplicates items in the `rustc_hir::arena`,
81+
// since we need to allocate this type on both the `rustc_hir` arena
82+
// (during lowering) and the `librustc_middle` arena (for decoding MIR)
83+
[decode] asm_template: rustc_ast::ast::InlineAsmTemplatePiece,
84+
7985
], $tcx);
8086
)
8187
}

‎src/librustc_mir/transform/generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl TransformVisitor<'tcx> {
266266

267267
// Create a statement which reads the discriminant into a temporary
268268
fn get_discr(&self, body: &mut Body<'tcx>) -> (Statement<'tcx>, Place<'tcx>) {
269-
let temp_decl = LocalDecl::new(self.tcx.types.isize, body.span).internal();
269+
let temp_decl = LocalDecl::new(self.discr_ty, body.span).internal();
270270
let local_decls_len = body.local_decls.push(temp_decl);
271271
let temp = Place::from(local_decls_len);
272272

‎src/librustc_target/asm/mod.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,19 @@ impl InlineAsmReg {
223223
name: Symbol,
224224
) -> Result<Self, &'static str> {
225225
// FIXME: use direct symbol comparison for register names
226-
name.with(|name| {
227-
Ok(match arch {
228-
InlineAsmArch::X86 | InlineAsmArch::X86_64 => {
229-
Self::X86(X86InlineAsmReg::parse(arch, has_feature, name)?)
230-
}
231-
InlineAsmArch::Arm => Self::Arm(ArmInlineAsmReg::parse(arch, has_feature, name)?),
232-
InlineAsmArch::AArch64 => {
233-
Self::AArch64(AArch64InlineAsmReg::parse(arch, has_feature, name)?)
234-
}
235-
InlineAsmArch::RiscV32 | InlineAsmArch::RiscV64 => {
236-
Self::RiscV(RiscVInlineAsmReg::parse(arch, has_feature, name)?)
237-
}
238-
})
226+
// Use `Symbol::as_str` instead of `Symbol::with` here because `has_feature` may access `Symbol`.
227+
let name = name.as_str();
228+
Ok(match arch {
229+
InlineAsmArch::X86 | InlineAsmArch::X86_64 => {
230+
Self::X86(X86InlineAsmReg::parse(arch, has_feature, &name)?)
231+
}
232+
InlineAsmArch::Arm => Self::Arm(ArmInlineAsmReg::parse(arch, has_feature, &name)?),
233+
InlineAsmArch::AArch64 => {
234+
Self::AArch64(AArch64InlineAsmReg::parse(arch, has_feature, &name)?)
235+
}
236+
InlineAsmArch::RiscV32 | InlineAsmArch::RiscV64 => {
237+
Self::RiscV(RiscVInlineAsmReg::parse(arch, has_feature, &name)?)
238+
}
239239
})
240240
}
241241

‎src/librustc_trait_selection/traits/error_reporting/mod.rs

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,12 +1000,15 @@ trait InferCtxtPrivExt<'tcx> {
10001000
trait_ref: &ty::PolyTraitRef<'tcx>,
10011001
);
10021002

1003-
fn mk_obligation_for_def_id(
1003+
/// Creates a `PredicateObligation` with `new_self_ty` replacing the existing type in the
1004+
/// `trait_ref`.
1005+
///
1006+
/// For this to work, `new_self_ty` must have no escaping bound variables.
1007+
fn mk_trait_obligation_with_new_self_ty(
10041008
&self,
1005-
def_id: DefId,
1006-
output_ty: Ty<'tcx>,
1007-
cause: ObligationCause<'tcx>,
10081009
param_env: ty::ParamEnv<'tcx>,
1010+
trait_ref: &ty::PolyTraitRef<'tcx>,
1011+
new_self_ty: Ty<'tcx>,
10091012
) -> PredicateObligation<'tcx>;
10101013

10111014
fn maybe_report_ambiguity(
@@ -1380,16 +1383,24 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
13801383
}
13811384
}
13821385

1383-
fn mk_obligation_for_def_id(
1386+
fn mk_trait_obligation_with_new_self_ty(
13841387
&self,
1385-
def_id: DefId,
1386-
output_ty: Ty<'tcx>,
1387-
cause: ObligationCause<'tcx>,
13881388
param_env: ty::ParamEnv<'tcx>,
1389+
trait_ref: &ty::PolyTraitRef<'tcx>,
1390+
new_self_ty: Ty<'tcx>,
13891391
) -> PredicateObligation<'tcx> {
1390-
let new_trait_ref =
1391-
ty::TraitRef { def_id, substs: self.tcx.mk_substs_trait(output_ty, &[]) };
1392-
Obligation::new(cause, param_env, new_trait_ref.without_const().to_predicate(self.tcx))
1392+
assert!(!new_self_ty.has_escaping_bound_vars());
1393+
1394+
let trait_ref = trait_ref.map_bound_ref(|tr| ty::TraitRef {
1395+
substs: self.tcx.mk_substs_trait(new_self_ty, &tr.substs[1..]),
1396+
..*tr
1397+
});
1398+
1399+
Obligation::new(
1400+
ObligationCause::dummy(),
1401+
param_env,
1402+
trait_ref.without_const().to_predicate(self.tcx),
1403+
)
13931404
}
13941405

13951406
fn maybe_report_ambiguity(

‎src/librustc_trait_selection/traits/error_reporting/suggestions.rs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,17 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
532532
};
533533
let msg = format!("use parentheses to call the {}", callable);
534534

535-
let obligation = self.mk_obligation_for_def_id(
536-
trait_ref.def_id(),
537-
output_ty.skip_binder(),
538-
obligation.cause.clone(),
539-
obligation.param_env,
540-
);
535+
// `mk_trait_obligation_with_new_self_ty` only works for types with no escaping bound
536+
// variables, so bail out if we have any.
537+
let output_ty = match output_ty.no_bound_vars() {
538+
Some(ty) => ty,
539+
None => return,
540+
};
541+
542+
let new_obligation =
543+
self.mk_trait_obligation_with_new_self_ty(obligation.param_env, trait_ref, output_ty);
541544

542-
match self.evaluate_obligation(&obligation) {
545+
match self.evaluate_obligation(&new_obligation) {
543546
Ok(
544547
EvaluationResult::EvaluatedToOk
545548
| EvaluationResult::EvaluatedToOkModuloRegions
@@ -694,7 +697,6 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
694697
err: &mut DiagnosticBuilder<'_>,
695698
trait_ref: &ty::Binder<ty::TraitRef<'tcx>>,
696699
) {
697-
let trait_ref = trait_ref.skip_binder();
698700
let span = obligation.cause.span;
699701

700702
if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
@@ -705,17 +707,16 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
705707
return;
706708
}
707709

708-
let mut trait_type = trait_ref.self_ty();
710+
let mut suggested_ty = trait_ref.self_ty();
709711

710712
for refs_remaining in 0..refs_number {
711-
if let ty::Ref(_, t_type, _) = trait_type.kind {
712-
trait_type = t_type;
713+
if let ty::Ref(_, inner_ty, _) = suggested_ty.kind {
714+
suggested_ty = inner_ty;
713715

714-
let new_obligation = self.mk_obligation_for_def_id(
715-
trait_ref.def_id,
716-
trait_type,
717-
ObligationCause::dummy(),
716+
let new_obligation = self.mk_trait_obligation_with_new_self_ty(
718717
obligation.param_env,
718+
trait_ref,
719+
suggested_ty,
719720
);
720721

721722
if self.predicate_may_hold(&new_obligation) {
@@ -782,20 +783,20 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
782783
return;
783784
}
784785

785-
let trait_type = match mutability {
786+
let suggested_ty = match mutability {
786787
hir::Mutability::Mut => self.tcx.mk_imm_ref(region, t_type),
787788
hir::Mutability::Not => self.tcx.mk_mut_ref(region, t_type),
788789
};
789790

790-
let new_obligation = self.mk_obligation_for_def_id(
791-
trait_ref.skip_binder().def_id,
792-
trait_type,
793-
ObligationCause::dummy(),
791+
let new_obligation = self.mk_trait_obligation_with_new_self_ty(
794792
obligation.param_env,
793+
&trait_ref,
794+
suggested_ty,
795795
);
796-
797-
if self.evaluate_obligation_no_overflow(&new_obligation).must_apply_modulo_regions()
798-
{
796+
let suggested_ty_would_satisfy_obligation = self
797+
.evaluate_obligation_no_overflow(&new_obligation)
798+
.must_apply_modulo_regions();
799+
if suggested_ty_would_satisfy_obligation {
799800
let sp = self
800801
.tcx
801802
.sess
@@ -812,7 +813,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
812813
err.note(&format!(
813814
"`{}` is implemented for `{:?}`, but not for `{:?}`",
814815
trait_ref.print_only_trait_path(),
815-
trait_type,
816+
suggested_ty,
816817
trait_ref.skip_binder().self_ty(),
817818
));
818819
}
@@ -1891,7 +1892,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
18911892
span: Span,
18921893
) {
18931894
debug!(
1894-
"suggest_await_befor_try: obligation={:?}, span={:?}, trait_ref={:?}, trait_ref_self_ty={:?}",
1895+
"suggest_await_before_try: obligation={:?}, span={:?}, trait_ref={:?}, trait_ref_self_ty={:?}",
18951896
obligation,
18961897
span,
18971898
trait_ref,
@@ -1946,16 +1947,15 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
19461947
);
19471948

19481949
debug!(
1949-
"suggest_await_befor_try: normalized_projection_type {:?}",
1950+
"suggest_await_before_try: normalized_projection_type {:?}",
19501951
self.resolve_vars_if_possible(&normalized_ty)
19511952
);
1952-
let try_obligation = self.mk_obligation_for_def_id(
1953-
trait_ref.def_id(),
1954-
normalized_ty,
1955-
obligation.cause.clone(),
1953+
let try_obligation = self.mk_trait_obligation_with_new_self_ty(
19561954
obligation.param_env,
1955+
trait_ref,
1956+
normalized_ty,
19571957
);
1958-
debug!("suggest_await_befor_try: try_trait_obligation {:?}", try_obligation);
1958+
debug!("suggest_await_before_try: try_trait_obligation {:?}", try_obligation);
19591959
if self.predicate_may_hold(&try_obligation) && impls_future {
19601960
if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
19611961
if snippet.ends_with('?') {

‎src/librustdoc/html/static/rustdoc.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
font-family: 'Fira Sans';
44
font-style: normal;
55
font-weight: 400;
6+
font-display: optional;
67
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
78
}
89
@font-face {
910
font-family: 'Fira Sans';
1011
font-style: normal;
1112
font-weight: 500;
13+
font-display: optional;
1214
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
1315
}
1416

@@ -17,18 +19,23 @@
1719
font-family: 'Source Serif Pro';
1820
font-style: normal;
1921
font-weight: 400;
22+
/* The difference for body text without this font is greater than other fonts,
23+
* so the 0~100ms block of fallback is preferred over optional, for legibility. */
24+
font-display: fallback;
2025
src: local('Source Serif Pro'), url("SourceSerifPro-Regular.ttf.woff") format('woff');
2126
}
2227
@font-face {
2328
font-family: 'Source Serif Pro';
2429
font-style: italic;
2530
font-weight: 400;
31+
font-display: optional;
2632
src: local('Source Serif Pro Italic'), url("SourceSerifPro-It.ttf.woff") format('woff');
2733
}
2834
@font-face {
2935
font-family: 'Source Serif Pro';
3036
font-style: normal;
3137
font-weight: 700;
38+
font-display: optional;
3239
src: local('Source Serif Pro Bold'), url("SourceSerifPro-Bold.ttf.woff") format('woff');
3340
}
3441

@@ -37,6 +44,7 @@
3744
font-family: 'Source Code Pro';
3845
font-style: normal;
3946
font-weight: 400;
47+
font-display: optional;
4048
/* Avoid using locally installed font because bad versions are in circulation:
4149
* see https://github.com/rust-lang/rust/issues/24355 */
4250
src: url("SourceCodePro-Regular.woff") format('woff');
@@ -45,6 +53,7 @@
4553
font-family: 'Source Code Pro';
4654
font-style: normal;
4755
font-weight: 600;
56+
font-display: optional;
4857
src: url("SourceCodePro-Semibold.woff") format('woff');
4958
}
5059

‎src/test/incremental/issue-72386.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// revisions: rpass1 cfail1 rpass3
2+
// only-x86_64
3+
// Regression test for issue #72386
4+
// Checks that we don't ICE when switching to an invalid register
5+
// and back again
6+
7+
#![feature(asm)]
8+
9+
#[cfg(any(rpass1, rpass3))]
10+
fn main() {
11+
unsafe {
12+
asm!("nop")
13+
}
14+
}
15+
16+
#[cfg(cfail1)]
17+
fn main() {
18+
unsafe {
19+
asm!("nop",out("invalid_reg")_)
20+
//[cfail1]~^ ERROR invalid register
21+
}
22+
}

‎src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn main::{{closure}}#0(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:10:15:
99
let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:12:9: 12:14
1010
let mut _7: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:18: 10:18
1111
let mut _8: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6
12-
let mut _9: isize; // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6
12+
let mut _9: u32; // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6
1313
scope 1 {
1414
debug _s => (((*_1) as variant#3).0: std::string::String); // in scope 1 at $DIR/generator-drop-cleanup.rs:11:13: 11:15
1515
}

‎src/test/mir-opt/generator-tiny/rustc.main-{{closure}}.generator_resume.0.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main::{{closure}}#0(_1: std::pin::Pin<&mut [generator@$DIR/generator-tiny.rs:
1212
let _8: (); // in scope 0 at $DIR/generator-tiny.rs:23:13: 23:21
1313
let mut _9: (); // in scope 0 at $DIR/generator-tiny.rs:19:25: 19:25
1414
let _10: u8; // in scope 0 at $DIR/generator-tiny.rs:19:17: 19:19
15-
let mut _11: isize; // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
15+
let mut _11: u32; // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
1616
scope 1 {
1717
debug _d => (((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}])) as variant#3).0: HasDrop); // in scope 1 at $DIR/generator-tiny.rs:20:13: 20:15
1818
}

‎src/test/ui/suggestions/into-str.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ LL | foo(String::new());
88
| ^^^ the trait `std::convert::From<std::string::String>` is not implemented for `&str`
99
|
1010
= note: to coerce a `std::string::String` into a `&str`, use `&*` as a prefix
11-
= note: `std::convert::From<std::string::String>` is implemented for `&mut str`, but not for `&str`
1211
= note: required because of the requirements on the impl of `std::convert::Into<&str>` for `std::string::String`
1312

1413
error: aborting due to previous error

‎src/test/ui/suggestions/issue-71394-no-from-impl.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
fn main() {
2+
let data: &[u8] = &[0; 10];
3+
let _: &[i8] = data.into();
4+
//~^ ERROR the trait bound `&[i8]: std::convert::From<&[u8]>` is not satisfied
5+
}

‎src/test/ui/suggestions/issue-71394-no-from-impl.stderr

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0277]: the trait bound `&[i8]: std::convert::From<&[u8]>` is not satisfied
2+
--> $DIR/issue-71394-no-from-impl.rs:3:25
3+
|
4+
LL | let _: &[i8] = data.into();
5+
| ^^^^ the trait `std::convert::From<&[u8]>` is not implemented for `&[i8]`
6+
|
7+
= note: required because of the requirements on the impl of `std::convert::Into<&[i8]>` for `&[u8]`
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0277`.

0 commit comments

Comments
 (0)