bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Pacify tidy

Browse source
This commit is contained in:
Jonas Schievink 2019-09-19 00:42:50 +02:00
parent a0cf5315ef
commit 98f02b2362
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc/ty/query/config.rs
View file

@ -78,7 +78,10 @@ impl<'tcx, M: QueryAccessors<'tcx, Key = DefId>> QueryDescription<'tcx> for M {
false false
} }
default fn try_load_from_disk(_: TyCtxt<'tcx>, _: SerializedDepNodeIndex) -> Option<Self::Value> { default fn try_load_from_disk(
_: TyCtxt<'tcx>,
_: SerializedDepNodeIndex,
) -> Option<Self::Value> {
bug!("QueryDescription::load_from_disk() called for an unsupported query.") bug!("QueryDescription::load_from_disk() called for an unsupported query.")
} }
} }

4
src/test/ui/specialization/specialization-default-methods-fail.rs
View file

@ -25,7 +25,7 @@ impl Foo for Box<i32> {}
// Can't override a non-`default` fn // Can't override a non-`default` fn
impl Foo for Box<i64> { impl Foo for Box<i64> {
fn foo(&self) -> bool { true } fn foo(&self) -> bool { true }
//~^ error: `foo` specializes an item from a parent `impl`, but that item is not marked `default` //~^ error: `foo` specializes an item from a parent `impl`, but that item is not marked `default`
} }
@ -37,7 +37,7 @@ impl Foo for Vec<()> {}
impl Foo for Vec<bool> { impl Foo for Vec<bool> {
fn foo(&self) -> bool { true } fn foo(&self) -> bool { true }
//~^ error: `foo` specializes an item from a parent `impl`, but that item is not marked `default` //~^ error: `foo` specializes an item from a parent `impl`, but that item is not marked `default`
} }
fn main() {} fn main() {}