Fix warnings and make CI working again (#4469)

* Fix warnings and make CI working again

* Fix test
This commit is contained in:
Bastian Köcher
2019-12-20 14:47:19 +01:00
committed by Arkadiy Paronyan
parent 7d4c6354df
commit bfad5f3ffc
9 changed files with 48 additions and 47 deletions
+3 -3
View File
@@ -1186,7 +1186,7 @@ macro_rules! decl_module {
{
#[doc(hidden)]
#[codec(skip)]
__PhantomItem($crate::sp_std::marker::PhantomData<($trait_instance $(, $instance)?)>, $crate::dispatch::Never),
__PhantomItem($crate::sp_std::marker::PhantomData<($trait_instance, $($instance)?)>, $crate::dispatch::Never),
$( $generated_variants )*
}
};
@@ -1224,7 +1224,7 @@ macro_rules! decl_module {
pub struct $mod_type<
$trait_instance: $trait_name
$(<I>, $instance: $instantiable $( = $module_default_instance)?)?
>($crate::sp_std::marker::PhantomData<($trait_instance $(, $instance)?)>) where
>($crate::sp_std::marker::PhantomData<($trait_instance, $( $instance)?)>) where
$( $other_where_bounds )*;
$crate::decl_module! {
@@ -1671,7 +1671,7 @@ macro_rules! __impl_module_constants_metadata {
<I>, $const_instance: $const_instantiable
)?
>($crate::dispatch::marker::PhantomData<
($const_trait_instance $(, $const_instance)?)
($const_trait_instance, $( $const_instance)?)
>);
impl<$const_trait_instance: 'static + $const_trait_name $(
<I>, $const_instance: $const_instantiable)?
+1 -1
View File
@@ -86,7 +86,7 @@ macro_rules! decl_error {
pub enum $error<$generic: $trait $(, $inst_generic: $instance)?> {
#[doc(hidden)]
__Ignore(
$crate::sp_std::marker::PhantomData<($generic $(, $inst_generic)?)>,
$crate::sp_std::marker::PhantomData<($generic, $( $inst_generic)?)>,
$crate::dispatch::Never,
),
$(