Auto merge of #4328 - phansch:rustup, r=phansch
Rustup to latest rustc master Broken due to: * https://github.com/rust-lang/rust/pull/63180 (`Existential` -> `OpaqueTy`) * https://github.com/rust-lang/rust/pull/63121 (New fields for `FormatSpec`) changelog: none
This commit is contained in:
commit
a24c7046f2
6 changed files with 10 additions and 8 deletions
|
@ -22,7 +22,7 @@ install:
|
|||
- del rust-toolchain
|
||||
- cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
|
||||
- rustup-toolchain-install-master %RUSTC_HASH% -f -n master
|
||||
- rustup component add rustfmt --toolchain nightly || echo "rustfmt nightly is unavailable"
|
||||
- rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
|
||||
- rustup default master
|
||||
- set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\master\bin
|
||||
- rustc -V
|
||||
|
|
|
@ -348,7 +348,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
|
|||
},
|
||||
TyKind::Def(item, _) => {
|
||||
let map = self.cx.tcx.hir();
|
||||
if let ItemKind::Existential(ref exist_ty) = map.expect_item(item.id).node {
|
||||
if let ItemKind::OpaqueTy(ref exist_ty) = map.expect_item(item.id).node {
|
||||
for bound in &exist_ty.bounds {
|
||||
if let GenericBound::Outlives(_) = *bound {
|
||||
self.record(&None);
|
||||
|
|
|
@ -148,7 +148,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
|
|||
hir::ItemKind::TraitAlias(..) => "a trait alias",
|
||||
hir::ItemKind::Ty(..) => "a type alias",
|
||||
hir::ItemKind::Union(..) => "a union",
|
||||
hir::ItemKind::Existential(..) => "an existential type",
|
||||
hir::ItemKind::OpaqueTy(..) => "an existential type",
|
||||
hir::ItemKind::ExternCrate(..)
|
||||
| hir::ItemKind::ForeignMod(..)
|
||||
| hir::ItemKind::GlobalAsm(..)
|
||||
|
@ -185,7 +185,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
|
|||
hir::ImplItemKind::Const(..) => "an associated constant",
|
||||
hir::ImplItemKind::Method(..) => "a method",
|
||||
hir::ImplItemKind::Type(_) => "an associated type",
|
||||
hir::ImplItemKind::Existential(_) => "an existential type",
|
||||
hir::ImplItemKind::OpaqueTy(_) => "an existential type",
|
||||
};
|
||||
self.check_missing_docs_attrs(cx, &impl_item.attrs, impl_item.span, desc);
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline {
|
|||
| hir::ItemKind::GlobalAsm(..)
|
||||
| hir::ItemKind::Ty(..)
|
||||
| hir::ItemKind::Union(..)
|
||||
| hir::ItemKind::Existential(..)
|
||||
| hir::ItemKind::OpaqueTy(..)
|
||||
| hir::ItemKind::ExternCrate(..)
|
||||
| hir::ItemKind::ForeignMod(..)
|
||||
| hir::ItemKind::Impl(..)
|
||||
|
@ -142,7 +142,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingInline {
|
|||
|
||||
let desc = match impl_item.node {
|
||||
hir::ImplItemKind::Method(..) => "a method",
|
||||
hir::ImplItemKind::Const(..) | hir::ImplItemKind::Type(_) | hir::ImplItemKind::Existential(_) => return,
|
||||
hir::ImplItemKind::Const(..) | hir::ImplItemKind::Type(_) | hir::ImplItemKind::OpaqueTy(_) => return,
|
||||
};
|
||||
|
||||
let def_id = cx.tcx.hir().local_def_id(impl_item.hir_id);
|
||||
|
|
|
@ -64,7 +64,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for DeepCodeInspector {
|
|||
},
|
||||
hir::ImplItemKind::Method(..) => println!("method"),
|
||||
hir::ImplItemKind::Type(_) => println!("associated type"),
|
||||
hir::ImplItemKind::Existential(_) => println!("existential type"),
|
||||
hir::ImplItemKind::OpaqueTy(_) => println!("existential type"),
|
||||
}
|
||||
}
|
||||
// fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx
|
||||
|
@ -363,7 +363,7 @@ fn print_item(cx: &LateContext<'_, '_>, item: &hir::Item) {
|
|||
hir::ItemKind::Ty(..) => {
|
||||
println!("type alias for {:?}", cx.tcx.type_of(did));
|
||||
},
|
||||
hir::ItemKind::Existential(..) => {
|
||||
hir::ItemKind::OpaqueTy(..) => {
|
||||
println!("existential type with real type {:?}", cx.tcx.type_of(did));
|
||||
},
|
||||
hir::ItemKind::Enum(..) => {
|
||||
|
|
|
@ -364,7 +364,9 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &TokenStream, is_write: bool) -> (O
|
|||
align: AlignUnknown,
|
||||
flags: 0,
|
||||
precision: CountImplied,
|
||||
precision_span: None,
|
||||
width: CountImplied,
|
||||
width_span: None,
|
||||
ty: "",
|
||||
};
|
||||
if !parser.eat(&token::Comma) {
|
||||
|
|
Loading…
Add table
Reference in a new issue