@@ -152,7 +152,7 @@ impl Locale {
152152 }
153153 }
154154
155- pub fn remove_variant ( & mut self , value : String ) {
155+ pub fn remove_variant ( & mut self , value : & str ) {
156156 if let Some ( ref mut variants) = self . variants {
157157 if let Some ( position) = variants. iter ( ) . position ( |x| * x == * value) {
158158 variants. remove ( position) ;
@@ -200,28 +200,28 @@ impl Locale {
200200 return false ;
201201 }
202202
203- if ( !available_range || ! self . language . is_none ( ) )
203+ if ( !available_range || self . language . is_some ( ) )
204204 && ( !requested_range || !other. get_language ( ) . is_empty ( ) )
205205 && self . get_language ( ) != other. get_language ( )
206206 {
207207 return false ;
208208 }
209209
210- if ( !available_range || ! self . script . is_none ( ) )
210+ if ( !available_range || self . script . is_some ( ) )
211211 && ( !requested_range || !other. get_script ( ) . is_empty ( ) )
212212 && self . get_script ( ) != other. get_script ( )
213213 {
214214 return false ;
215215 }
216216
217- if ( !available_range || ! self . region . is_none ( ) )
217+ if ( !available_range || self . region . is_some ( ) )
218218 && ( !requested_range || !other. get_region ( ) . is_empty ( ) )
219219 && self . get_region ( ) != other. get_region ( )
220220 {
221221 return false ;
222222 }
223223
224- if ( !available_range || ! self . variants . is_none ( ) )
224+ if ( !available_range || self . variants . is_some ( ) )
225225 && ( !requested_range || !other. get_variants ( ) . is_empty ( ) )
226226 && self . get_variants ( ) != other. get_variants ( )
227227 {
0 commit comments