Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove redundant capitalizations in unmarshalText #1444

Merged
merged 1 commit into from
Jun 6, 2024

Conversation

sywhang
Copy link
Contributor

@sywhang sywhang commented Jun 6, 2024

unmarshalText currently checks for almost all of the levels as
the configured string values as well as their capitalized versions.

But we call unmarshalText with bytes.ToLower() when we actually parse
the levels, so we do not need to check for the capitalized versions
separately since this is redundant.

Previous version of this PR was trying to add "WARNING" as a check
to this since that was recently added but the corresponding capitalized
string wasn't checked, but @abhinav pointed out that we actually call
this with ToLower, so it's better to remove the redundant checks.

Copy link

codecov bot commented Jun 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.70%. Comparing base (8a805fa) to head (4ec8a00).

Current head 4ec8a00 differs from pull request most recent head 76bcd09

Please upload reports for the commit 76bcd09 to get more accurate results.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1444   +/-   ##
=======================================
  Coverage   98.70%   98.70%           
=======================================
  Files          53       53           
  Lines        3014     3014           
=======================================
  Hits         2975     2975           
  Misses         31       31           
  Partials        8        8           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

zapcore/level.go Outdated Show resolved Hide resolved
unmarshalText currently checks for almost all of the levels as
the configured string values as well as their capitalized versions.

But we call unmarshalText with bytes.ToLower() when we actually parse
the levels, so we do not need to check for the capitalized versions
separately since this is redundant.

Previous version of this PR was trying to add "WARNING" as a check
to this since that was recently added but the corresponding capitalized
string wasn't checked, but @abhinav pointed out that we actually call
this with ToLower, so it's better to remove the redundant checks.
@sywhang sywhang changed the title recognize capitalized "warning" as a level remove redundant capitalizations in unmarshalText Jun 6, 2024
@sywhang sywhang merged commit d53ffd2 into uber-go:master Jun 6, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants