Skip to content

Commit 5472b07

Browse files
borsbors
committed
Auto merge of #54809 - pietroalbini:rollup, r=pietroalbini
Rollup of 10 pull requests Successful merges: - #53523 (Add doc for impl From for Std Error) - #54746 (simplify some unused lints code) - #54761 (Make spec_extend use for_each()) - #54769 (Fix typo in CONTRIBUTING.md) - #54773 (Update a FIXME in memory.rs) - #54777 (abolish ICE when pretty-printing async block) - #54780 (Remove duplicate predicates in `explicit_predicates_of`) - #54788 (A handful of cleanups for rustc/mir) - #54789 (Introduce `TyKind::UnnormalizedProjection`) - #54795 (remove padding from multiline format string label) Failed merges: r? @ghost
2 parents 8a0e5cb + 71aded8 commit 5472b07

Some content is hidden

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

44 files changed

+304
-76
lines changed

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ labels to triage issues:
566566
to fix the issue.
567567

568568
* The dark blue **final-comment-period** label marks bugs that are using the
569-
RFC signoff functionality of [rfcbot][rfcbot] and are currenty in the final
569+
RFC signoff functionality of [rfcbot][rfcbot] and are currently in the final
570570
comment period.
571571

572572
* Red, **I**-prefixed labels indicate the **importance** of the issue. The

‎src/liballoc/vec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1822,12 +1822,12 @@ impl<T, I> SpecExtend<T, I> for Vec<T>
18221822
unsafe {
18231823
let mut ptr = self.as_mut_ptr().add(self.len());
18241824
let mut local_len = SetLenOnDrop::new(&mut self.len);
1825-
for element in iterator {
1825+
iterator.for_each(move |element| {
18261826
ptr::write(ptr, element);
18271827
ptr = ptr.offset(1);
18281828
// NB can't overflow since we would have had to alloc the address space
18291829
local_len.increment_len(1);
1830-
}
1830+
});
18311831
}
18321832
} else {
18331833
self.extend_desugared(iterator)

‎src/libfmt_macros/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ impl<'a> Parser<'a> {
288288
self.cur.next();
289289
Some(pos)
290290
} else {
291-
let pos = pos + padding + 1;
291+
let pos = pos + raw + 1;
292292
self.err(format!("expected `{:?}`, found `{:?}`", c, maybe),
293293
format!("expected `{}`", c),
294294
pos,

‎src/librustc/ich/impls_ty.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -873,8 +873,8 @@ for ty::TyKind<'gcx>
873873
Tuple(inner_tys) => {
874874
inner_tys.hash_stable(hcx, hasher);
875875
}
876-
Projection(ref projection_ty) => {
877-
projection_ty.hash_stable(hcx, hasher);
876+
Projection(ref data) | UnnormalizedProjection(ref data) => {
877+
data.hash_stable(hcx, hasher);
878878
}
879879
Opaque(def_id, substs) => {
880880
def_id.hash_stable(hcx, hasher);

‎src/librustc/infer/canonical/canonicalizer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ impl<'cx, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for Canonicalizer<'cx, 'gcx, 'tcx>
283283
| ty::Never
284284
| ty::Tuple(..)
285285
| ty::Projection(..)
286+
| ty::UnnormalizedProjection(..)
286287
| ty::Foreign(..)
287288
| ty::Param(..)
288289
| ty::Opaque(..) => {

‎src/librustc/infer/freshen.rs

+1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
193193
ty::Never |
194194
ty::Tuple(..) |
195195
ty::Projection(..) |
196+
ty::UnnormalizedProjection(..) |
196197
ty::Foreign(..) |
197198
ty::Param(..) |
198199
ty::Closure(..) |

‎src/librustc/mir/interpret/value.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl<'tcx> Scalar {
171171
pub fn from_uint(i: impl Into<u128>, size: Size) -> Self {
172172
let i = i.into();
173173
debug_assert_eq!(truncate(i, size), i,
174-
"Unsigned value {} does not fit in {} bits", i, size.bits());
174+
"Unsigned value {} does not fit in {} bits", i, size.bits());
175175
Scalar::Bits { bits: i, size: size.bytes() as u8 }
176176
}
177177

@@ -181,7 +181,7 @@ impl<'tcx> Scalar {
181181
// `into` performed sign extension, we have to truncate
182182
let truncated = truncate(i as u128, size);
183183
debug_assert_eq!(sign_extend(truncated, size) as i128, i,
184-
"Signed value {} does not fit in {} bits", i, size.bits());
184+
"Signed value {} does not fit in {} bits", i, size.bits());
185185
Scalar::Bits { bits: truncated, size: size.bytes() as u8 }
186186
}
187187

‎src/librustc/mir/mod.rs

+13-18
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
//!
1313
//! [rustc guide]: https://rust-lang-nursery.github.io/rustc-guide/mir/index.html
1414
15-
use graphviz::IntoCow;
1615
use hir::def::CtorKind;
1716
use hir::def_id::DefId;
1817
use hir::{self, HirId, InlineAsm};
@@ -327,22 +326,20 @@ impl<'tcx> Mir<'tcx> {
327326
if idx < stmts.len() {
328327
&stmts[idx].source_info
329328
} else {
330-
assert!(idx == stmts.len());
329+
assert_eq!(idx, stmts.len());
331330
&block.terminator().source_info
332331
}
333332
}
334333

335334
/// Check if `sub` is a sub scope of `sup`
336335
pub fn is_sub_scope(&self, mut sub: SourceScope, sup: SourceScope) -> bool {
337-
loop {
338-
if sub == sup {
339-
return true;
340-
}
336+
while sub != sup {
341337
match self.source_scopes[sub].parent_scope {
342338
None => return false,
343339
Some(p) => sub = p,
344340
}
345341
}
342+
true
346343
}
347344

348345
/// Return the return type, it always return first element from `local_decls` array
@@ -526,9 +523,7 @@ impl BorrowKind {
526523
pub fn allows_two_phase_borrow(&self) -> bool {
527524
match *self {
528525
BorrowKind::Shared | BorrowKind::Shallow | BorrowKind::Unique => false,
529-
BorrowKind::Mut {
530-
allow_two_phase_borrow,
531-
} => allow_two_phase_borrow,
526+
BorrowKind::Mut { allow_two_phase_borrow } => allow_two_phase_borrow,
532527
}
533528
}
534529
}
@@ -1574,42 +1569,42 @@ impl<'tcx> TerminatorKind<'tcx> {
15741569
};
15751570
fmt_const_val(&mut s, &c).unwrap();
15761571
s.into()
1577-
}).chain(iter::once(String::from("otherwise").into()))
1572+
}).chain(iter::once("otherwise".into()))
15781573
.collect()
15791574
}
15801575
Call {
15811576
destination: Some(_),
15821577
cleanup: Some(_),
15831578
..
1584-
} => vec!["return".into_cow(), "unwind".into_cow()],
1579+
} => vec!["return".into(), "unwind".into()],
15851580
Call {
15861581
destination: Some(_),
15871582
cleanup: None,
15881583
..
1589-
} => vec!["return".into_cow()],
1584+
} => vec!["return".into()],
15901585
Call {
15911586
destination: None,
15921587
cleanup: Some(_),
15931588
..
1594-
} => vec!["unwind".into_cow()],
1589+
} => vec!["unwind".into()],
15951590
Call {
15961591
destination: None,
15971592
cleanup: None,
15981593
..
15991594
} => vec![],
1600-
Yield { drop: Some(_), .. } => vec!["resume".into_cow(), "drop".into_cow()],
1601-
Yield { drop: None, .. } => vec!["resume".into_cow()],
1595+
Yield { drop: Some(_), .. } => vec!["resume".into(), "drop".into()],
1596+
Yield { drop: None, .. } => vec!["resume".into()],
16021597
DropAndReplace { unwind: None, .. } | Drop { unwind: None, .. } => {
1603-
vec!["return".into_cow()]
1598+
vec!["return".into()]
16041599
}
16051600
DropAndReplace {
16061601
unwind: Some(_), ..
16071602
}
16081603
| Drop {
16091604
unwind: Some(_), ..
1610-
} => vec!["return".into_cow(), "unwind".into_cow()],
1605+
} => vec!["return".into(), "unwind".into()],
16111606
Assert { cleanup: None, .. } => vec!["".into()],
1612-
Assert { .. } => vec!["success".into_cow(), "unwind".into_cow()],
1607+
Assert { .. } => vec!["success".into(), "unwind".into()],
16131608
FalseEdges {
16141609
ref imaginary_targets,
16151610
..

‎src/librustc/mir/mono.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl<'a, 'gcx: 'tcx, 'tcx: 'a> CodegenUnitNameBuilder<'a, 'gcx, 'tcx> {
325325
String::new()
326326
};
327327

328-
let crate_disambiguator = format!("{}", tcx.crate_disambiguator(cnum));
328+
let crate_disambiguator = tcx.crate_disambiguator(cnum).to_string();
329329
// Using a shortened disambiguator of about 40 bits
330330
format!("{}.{}{}",
331331
tcx.crate_name(cnum),

‎src/librustc/mir/tcx.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ impl<'a, 'gcx, 'tcx> PlaceTy<'tcx> {
8787
assert!(index < adt_def.variants.len());
8888
assert_eq!(adt_def, adt_def1);
8989
PlaceTy::Downcast { adt_def,
90-
substs,
91-
variant_index: index }
90+
substs,
91+
variant_index: index }
9292
}
9393
_ => {
9494
bug!("cannot downcast non-ADT type: `{:?}`", self)
@@ -151,7 +151,7 @@ impl<'tcx> Place<'tcx> {
151151
}
152152
},
153153
_ => None,
154-
}
154+
}
155155
_ => None,
156156
}
157157
}
@@ -255,9 +255,9 @@ impl<'tcx> Operand<'tcx> {
255255

256256
impl<'tcx> BinOp {
257257
pub fn ty<'a, 'gcx>(&self, tcx: TyCtxt<'a, 'gcx, 'tcx>,
258-
lhs_ty: Ty<'tcx>,
259-
rhs_ty: Ty<'tcx>)
260-
-> Ty<'tcx> {
258+
lhs_ty: Ty<'tcx>,
259+
rhs_ty: Ty<'tcx>)
260+
-> Ty<'tcx> {
261261
// FIXME: handle SIMD correctly
262262
match self {
263263
&BinOp::Add | &BinOp::Sub | &BinOp::Mul | &BinOp::Div | &BinOp::Rem |

‎src/librustc/traits/coherence.rs

+1
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ fn ty_is_local_constructor(ty: Ty<'_>, in_crate: InCrate) -> bool {
475475

476476
ty::Error => true,
477477

478+
ty::UnnormalizedProjection(..) |
478479
ty::Closure(..) |
479480
ty::Generator(..) |
480481
ty::GeneratorWitness(..) |

‎src/librustc/traits/error_reporting.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
269269
ty::Generator(..) => Some(18),
270270
ty::Foreign(..) => Some(19),
271271
ty::GeneratorWitness(..) => Some(20),
272-
ty::Infer(..) | ty::Error => None
272+
ty::Infer(..) | ty::Error => None,
273+
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
273274
}
274275
}
275276

‎src/librustc/traits/query/dropck_outlives.rs

+2
Original file line numberDiff line numberDiff line change
@@ -253,5 +253,7 @@ pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'_, '_, 'tcx>, ty: Ty<'tcx>) ->
253253
| ty::Opaque(..)
254254
| ty::Infer(_)
255255
| ty::Generator(..) => false,
256+
257+
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
256258
}
257259
}

‎src/librustc/traits/select.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2283,6 +2283,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
22832283
ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => None,
22842284
ty::Infer(ty::TyVar(_)) => Ambiguous,
22852285

2286+
ty::UnnormalizedProjection(..) |
22862287
ty::Infer(ty::CanonicalTy(_)) |
22872288
ty::Infer(ty::FreshTy(_)) |
22882289
ty::Infer(ty::FreshIntTy(_)) |
@@ -2355,6 +2356,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
23552356
Ambiguous
23562357
}
23572358

2359+
ty::UnnormalizedProjection(..) |
23582360
ty::Infer(ty::CanonicalTy(_)) |
23592361
ty::Infer(ty::FreshTy(_)) |
23602362
ty::Infer(ty::FreshIntTy(_)) |
@@ -2393,6 +2395,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
23932395
Vec::new()
23942396
}
23952397

2398+
ty::UnnormalizedProjection(..) |
23962399
ty::Dynamic(..) |
23972400
ty::Param(..) |
23982401
ty::Foreign(..) |

‎src/librustc/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2234,7 +2234,7 @@ impl<'a, 'tcx> TyCtxt<'a, 'tcx, 'tcx> {
22342234
self,
22352235
Adt, Array, Slice, RawPtr, Ref, FnDef, FnPtr,
22362236
Generator, GeneratorWitness, Dynamic, Closure, Tuple,
2237-
Param, Infer, Projection, Opaque, Foreign);
2237+
Param, Infer, UnnormalizedProjection, Projection, Opaque, Foreign);
22382238

22392239
println!("Substs interner: #{}", self.interners.substs.borrow().len());
22402240
println!("Region interner: #{}", self.interners.region.borrow().len());

‎src/librustc/ty/error.rs

+1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ impl<'a, 'gcx, 'lcx, 'tcx> ty::TyS<'tcx> {
222222
ty::Infer(ty::FreshIntTy(_)) => "skolemized integral type".to_string(),
223223
ty::Infer(ty::FreshFloatTy(_)) => "skolemized floating-point type".to_string(),
224224
ty::Projection(_) => "associated type".to_string(),
225+
ty::UnnormalizedProjection(_) => "non-normalized associated type".to_string(),
225226
ty::Param(ref p) => {
226227
if p.is_self() {
227228
"Self".to_string()

‎src/librustc/ty/fast_reject.rs

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ pub fn simplify_type<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
103103
ty::FnPtr(ref f) => {
104104
Some(FunctionSimplifiedType(f.skip_binder().inputs().len()))
105105
}
106+
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
106107
ty::Projection(_) | ty::Param(_) => {
107108
if can_simplify_params {
108109
// In normalized types, projections don't unify with

‎src/librustc/ty/flags.rs

+2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ impl FlagComputation {
150150
self.add_projection_ty(data);
151151
}
152152

153+
&ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
154+
153155
&ty::Opaque(_, substs) => {
154156
self.add_flags(TypeFlags::HAS_PROJECTION);
155157
self.add_substs(substs);

‎src/librustc/ty/item_path.rs

+1
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ pub fn characteristic_def_id_of_type(ty: Ty<'_>) -> Option<DefId> {
463463
ty::Str |
464464
ty::FnPtr(_) |
465465
ty::Projection(_) |
466+
ty::UnnormalizedProjection(..) |
466467
ty::Param(_) |
467468
ty::Opaque(..) |
468469
ty::Infer(_) |

‎src/librustc/ty/layout.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> {
11231123
}
11241124
tcx.layout_raw(param_env.and(normalized))?
11251125
}
1126-
ty::GeneratorWitness(..) | ty::Infer(_) => {
1126+
ty::UnnormalizedProjection(..) | ty::GeneratorWitness(..) | ty::Infer(_) => {
11271127
bug!("LayoutDetails::compute: unexpected type `{}`", ty)
11281128
}
11291129
ty::Param(_) | ty::Error => {
@@ -1702,8 +1702,8 @@ impl<'a, 'tcx, C> TyLayoutMethods<'tcx, C> for Ty<'tcx>
17021702
}
17031703
}
17041704

1705-
ty::Projection(_) | ty::Opaque(..) | ty::Param(_) |
1706-
ty::Infer(_) | ty::Error => {
1705+
ty::Projection(_) | ty::UnnormalizedProjection(..) |
1706+
ty::Opaque(..) | ty::Param(_) | ty::Infer(_) | ty::Error => {
17071707
bug!("TyLayout::field_type: unexpected type `{}`", this.ty)
17081708
}
17091709
})

‎src/librustc/ty/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2340,6 +2340,8 @@ impl<'a, 'gcx, 'tcx> AdtDef {
23402340
vec![ty]
23412341
}
23422342

2343+
UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
2344+
23432345
Param(..) => {
23442346
// perf hack: if there is a `T: Sized` bound, then
23452347
// we know that `T` is Sized and do not need to check

‎src/librustc/ty/outlives.rs

+2
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
124124
}
125125
}
126126

127+
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
128+
127129
// We assume that inference variables are fully resolved.
128130
// So, if we encounter an inference variable, just record
129131
// the unresolved variable as a component.

‎src/librustc/ty/structural_impls.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,9 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
876876
ty::GeneratorWitness(types) => ty::GeneratorWitness(types.fold_with(folder)),
877877
ty::Closure(did, substs) => ty::Closure(did, substs.fold_with(folder)),
878878
ty::Projection(ref data) => ty::Projection(data.fold_with(folder)),
879+
ty::UnnormalizedProjection(ref data) => {
880+
ty::UnnormalizedProjection(data.fold_with(folder))
881+
}
879882
ty::Opaque(did, substs) => ty::Opaque(did, substs.fold_with(folder)),
880883
ty::Bool | ty::Char | ty::Str | ty::Int(_) |
881884
ty::Uint(_) | ty::Float(_) | ty::Error | ty::Infer(_) |
@@ -910,7 +913,9 @@ impl<'tcx> TypeFoldable<'tcx> for Ty<'tcx> {
910913
}
911914
ty::GeneratorWitness(ref types) => types.visit_with(visitor),
912915
ty::Closure(_did, ref substs) => substs.visit_with(visitor),
913-
ty::Projection(ref data) => data.visit_with(visitor),
916+
ty::Projection(ref data) | ty::UnnormalizedProjection(ref data) => {
917+
data.visit_with(visitor)
918+
}
914919
ty::Opaque(_, ref substs) => substs.visit_with(visitor),
915920
ty::Bool | ty::Char | ty::Str | ty::Int(_) |
916921
ty::Uint(_) | ty::Float(_) | ty::Error | ty::Infer(_) |

‎src/librustc/ty/sty.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ pub enum TyKind<'tcx> {
157157
/// `<T as Trait<..>>::N`.
158158
Projection(ProjectionTy<'tcx>),
159159

160+
/// A placeholder type used when we do not have enough information
161+
/// to normalize the projection of an associated type to an
162+
/// existing concrete type. Currently only used with chalk-engine.
163+
UnnormalizedProjection(ProjectionTy<'tcx>),
164+
160165
/// Opaque (`impl Trait`) type found in a return type.
161166
/// The `DefId` comes either from
162167
/// * the `impl Trait` ast::Ty node,
@@ -1806,7 +1811,7 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
18061811
Generator(_, GeneratorSubsts { ref substs }, _) => {
18071812
substs.regions().collect()
18081813
}
1809-
Projection(ref data) => {
1814+
Projection(ref data) | UnnormalizedProjection(ref data) => {
18101815
data.substs.regions().collect()
18111816
}
18121817
FnDef(..) |
@@ -1886,6 +1891,8 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
18861891

18871892
ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => false,
18881893

1894+
ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
1895+
18891896
ty::Infer(ty::TyVar(_)) => false,
18901897

18911898
ty::Infer(ty::CanonicalTy(_)) |

0 commit comments

Comments
 (0)