Merge pull request #954 from JasonLG1979/remove-dep-warning

Remove basic normalisation deprecation warning
This commit is contained in:
Roderick van Domburg 2022-01-28 08:45:18 +01:00 committed by GitHub
commit f4be9bb85d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1293,12 +1293,7 @@ fn get_setup() -> Setup {
normalisation_method = opt_str(NORMALISATION_METHOD) normalisation_method = opt_str(NORMALISATION_METHOD)
.as_deref() .as_deref()
.map(|method| { .map(|method| {
warn!( NormalisationMethod::from_str(method).unwrap_or_else(|_| {
"`--{}` / `-{}` will be deprecated in a future release.",
NORMALISATION_METHOD, NORMALISATION_METHOD_SHORT
);
let method = NormalisationMethod::from_str(method).unwrap_or_else(|_| {
invalid_error_msg( invalid_error_msg(
NORMALISATION_METHOD, NORMALISATION_METHOD,
NORMALISATION_METHOD_SHORT, NORMALISATION_METHOD_SHORT,
@ -1308,16 +1303,7 @@ fn get_setup() -> Setup {
); );
exit(1); exit(1);
}); })
if matches!(method, NormalisationMethod::Basic) {
warn!(
"`--{}` / `-{}` {:?} will be deprecated in a future release.",
NORMALISATION_METHOD, NORMALISATION_METHOD_SHORT, method
);
}
method
}) })
.unwrap_or(player_default_config.normalisation_method); .unwrap_or(player_default_config.normalisation_method);