@@ -24,7 +24,7 @@ pub struct Conf<T> {
2424 pub confidence : u8 ,
2525}
2626
27- pub trait ConfMergable < T , O > {
27+ pub trait ConfMergeable < T , O > {
2828 type Result ;
2929 /// Merge two confidence types' values depending on whichever has higher confidence
3030 /// In the event of a tie, the LHS (caller's) value is used.
@@ -57,7 +57,7 @@ impl<T> Conf<T> {
5757/// Returns best value or LHS on tie
5858///
5959/// `Conf<T>` + `Conf<T>` → `Conf<T>`
60- impl < T > ConfMergable < T , Conf < T > > for Conf < T > {
60+ impl < T > ConfMergeable < T , Conf < T > > for Conf < T > {
6161 type Result = Conf < T > ;
6262 fn merge ( self , other : Conf < T > ) -> Conf < T > {
6363 if other. confidence > self . confidence {
@@ -71,7 +71,7 @@ impl<T> ConfMergable<T, Conf<T>> for Conf<T> {
7171/// Returns LHS if RHS is None
7272///
7373/// `Conf<T>` + `Option<Conf<T>>` → `Conf<T>`
74- impl < T > ConfMergable < T , Option < Conf < T > > > for Conf < T > {
74+ impl < T > ConfMergeable < T , Option < Conf < T > > > for Conf < T > {
7575 type Result = Conf < T > ;
7676 fn merge ( self , other : Option < Conf < T > > ) -> Conf < T > {
7777 match other {
@@ -84,7 +84,7 @@ impl<T> ConfMergable<T, Option<Conf<T>>> for Conf<T> {
8484/// Returns RHS if LHS is None
8585///
8686/// `Option<Conf<T>>` + `Conf<T>` → `Conf<T>`
87- impl < T > ConfMergable < T , Conf < T > > for Option < Conf < T > > {
87+ impl < T > ConfMergeable < T , Conf < T > > for Option < Conf < T > > {
8888 type Result = Conf < T > ;
8989 fn merge ( self , other : Conf < T > ) -> Conf < T > {
9090 match self {
@@ -97,7 +97,7 @@ impl<T> ConfMergable<T, Conf<T>> for Option<Conf<T>> {
9797/// Returns best non-None value or None
9898///
9999/// `Option<Conf<T>>` + `Option<Conf<T>>` → `Option<Conf<T>>`
100- impl < T > ConfMergable < T , Option < Conf < T > > > for Option < Conf < T > > {
100+ impl < T > ConfMergeable < T , Option < Conf < T > > > for Option < Conf < T > > {
101101 type Result = Option < Conf < T > > ;
102102 fn merge ( self , other : Option < Conf < T > > ) -> Option < Conf < T > > {
103103 match ( self , other) {
0 commit comments