Skip to content

Commit 5f57b68

Browse files
committed
Auto merge of #4328 - phansch:rustup, r=phansch
Rustup to latest rustc master Broken due to: * rust-lang/rust#63180 (`Existential` -> `OpaqueTy`) * rust-lang/rust#63121 (New fields for `FormatSpec`)
2 parents d43ef7a + d61df4f commit 5f57b68

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

clippy_lints/src/lifetimes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
348348
},
349349
TyKind::Def(item, _) => {
350350
let map = self.cx.tcx.hir();
351-
if let ItemKind::Existential(ref exist_ty) = map.expect_item(item.id).node {
351+
if let ItemKind::OpaqueTy(ref exist_ty) = map.expect_item(item.id).node {
352352
for bound in &exist_ty.bounds {
353353
if let GenericBound::Outlives(_) = *bound {
354354
self.record(&None);

clippy_lints/src/missing_doc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
148148
hir::ItemKind::TraitAlias(..) => "a trait alias",
149149
hir::ItemKind::Ty(..) => "a type alias",
150150
hir::ItemKind::Union(..) => "a union",
151-
hir::ItemKind::Existential(..) => "an existential type",
151+
hir::ItemKind::OpaqueTy(..) => "an existential type",
152152
hir::ItemKind::ExternCrate(..)
153153
| hir::ItemKind::ForeignMod(..)
154154
| hir::ItemKind::GlobalAsm(..)
@@ -185,7 +185,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
185185
hir::ImplItemKind::Const(..) => "an associated constant",
186186
hir::ImplItemKind::Method(..) => "a method",
187187
hir::ImplItemKind::Type(_) => "an associated type",
188-
hir::ImplItemKind::Existential(_) => "an existential type",
188+
hir::ImplItemKind::OpaqueTy(_) => "an existential type",
189189
};
190190
self.check_missing_docs_attrs(cx, &impl_item.attrs, impl_item.span, desc);
191191
}

clippy_lints/src/missing_inline.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline {
121121
| hir::ItemKind::GlobalAsm(..)
122122
| hir::ItemKind::Ty(..)
123123
| hir::ItemKind::Union(..)
124-
| hir::ItemKind::Existential(..)
124+
| hir::ItemKind::OpaqueTy(..)
125125
| hir::ItemKind::ExternCrate(..)
126126
| hir::ItemKind::ForeignMod(..)
127127
| hir::ItemKind::Impl(..)
@@ -142,7 +142,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline {
142142

143143
let desc = match impl_item.node {
144144
hir::ImplItemKind::Method(..) => "a method",
145-
hir::ImplItemKind::Const(..) | hir::ImplItemKind::Type(_) | hir::ImplItemKind::Existential(_) => return,
145+
hir::ImplItemKind::Const(..) | hir::ImplItemKind::Type(_) | hir::ImplItemKind::OpaqueTy(_) => return,
146146
};
147147

148148
let def_id = cx.tcx.hir().local_def_id(impl_item.hir_id);

clippy_lints/src/utils/inspector.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DeepCodeInspector {
6464
},
6565
hir::ImplItemKind::Method(..) => println!("method"),
6666
hir::ImplItemKind::Type(_) => println!("associated type"),
67-
hir::ImplItemKind::Existential(_) => println!("existential type"),
67+
hir::ImplItemKind::OpaqueTy(_) => println!("existential type"),
6868
}
6969
}
7070
// fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx
@@ -363,7 +363,7 @@ fn print_item(cx: &LateContext<'_, '_>, item: &hir::Item) {
363363
hir::ItemKind::Ty(..) => {
364364
println!("type alias for {:?}", cx.tcx.type_of(did));
365365
},
366-
hir::ItemKind::Existential(..) => {
366+
hir::ItemKind::OpaqueTy(..) => {
367367
println!("existential type with real type {:?}", cx.tcx.type_of(did));
368368
},
369369
hir::ItemKind::Enum(..) => {

clippy_lints/src/write.rs

+2
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,9 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &TokenStream, is_write: bool) -> (O
364364
align: AlignUnknown,
365365
flags: 0,
366366
precision: CountImplied,
367+
precision_span: None,
367368
width: CountImplied,
369+
width_span: None,
368370
ty: "",
369371
};
370372
if !parser.eat(&token::Comma) {

0 commit comments

Comments
 (0)