Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Fix padding #1541

Merged
merged 6 commits into from
Jan 8, 2021
Merged

Fix padding #1541

merged 6 commits into from
Jan 8, 2021

Conversation

whaught
Copy link
Contributor

@whaught whaught commented Jan 8, 2021

Proposed Changes

Release Note

correct padding

@google-cla google-cla bot added the cla: yes Auto: added by CLA bot when all committers have signed a CLA. label Jan 8, 2021
@@ -149,6 +149,16 @@ func (p Padding) MarshalJSON() ([]byte, error) {
return []byte(s), nil
}

// UnmarshalJSON is a custom JSON unmarshaler for padding.
// The field is meaningless bytes, so this is just a passthrough.
func (p *Padding) UnmarshalJSON(b []byte) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Functionally no, but we need this to be able to assert that the padding is there in the tests

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikehelmick, whaught

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [mikehelmick,whaught]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-robot google-oss-robot merged commit 9c4330d into google:main Jan 8, 2021
@whaught whaught deleted the padding branch January 8, 2021 20:16
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla: yes Auto: added by CLA bot when all committers have signed a CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants