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

Bump serde_derive from 1.0.87 to 1.0.88 #2781

Merged
merged 1 commit into from
Feb 16, 2019

Conversation

dependabot-preview[bot]
Copy link
Contributor

@dependabot-preview dependabot-preview bot commented Feb 16, 2019

Bumps serde_derive from 1.0.87 to 1.0.88.

Release notes

Sourced from serde_derive's releases.

v1.0.88

  • Support flatten and skip_serializing / skip_deserializing attributes on the same field
Commits
  • 64c483c Release 1.0.88
  • 19091aa Fix mistaken double negative in flatten error message
  • ef9028d Remove conflict between flatten and skip
  • 1668cd1 Eliminate try!(..).value to improve rustfmt'd code
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot ignore this [patch|minor|major] version will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
  • @dependabot use these labels will set the current labels as the default for future PRs for this repo and language
  • @dependabot use these reviewers will set the current reviewers as the default for future PRs for this repo and language
  • @dependabot use these assignees will set the current assignees as the default for future PRs for this repo and language
  • @dependabot use this milestone will set the current milestone as the default for future PRs for this repo and language
  • @dependabot badge me will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot dashboard:

  • Update frequency (including time of day and day of week)
  • Automerge options (never/patch/minor, and dev/runtime dependencies)
  • Pull request limits (per update run and/or open at any time)
  • Out-of-range updates (receive only lockfile updates, if desired)
  • Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

@codecov
Copy link

codecov bot commented Feb 16, 2019

Codecov Report

Merging #2781 into master will increase coverage by 2.2%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           master   #2781     +/-   ##
========================================
+ Coverage    76.3%   78.5%   +2.2%     
========================================
  Files         119     119             
  Lines       20087   19508    -579     
========================================
  Hits        15328   15328             
+ Misses       4759    4180    -579

@garious
Copy link
Contributor

garious commented Feb 16, 2019

@dependabot rebase

@garious garious added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2019
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2019
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to merge conflict

@dependabot-preview dependabot-preview bot force-pushed the dependabot/cargo/serde_derive-1.0.88 branch from 602ca73 to 854fc94 Compare February 16, 2019 12:04
@garious garious added the automerge Merge this Pull Request automatically once CI passes label Feb 16, 2019
@solana-grimes solana-grimes merged commit 38aed0c into master Feb 16, 2019
@dependabot-preview dependabot-preview bot deleted the dependabot/cargo/serde_derive-1.0.88 branch February 16, 2019 12:57
willhickey pushed a commit that referenced this pull request Aug 31, 2024
…ackport of #2758) (#2781)

* RPC: rewards, return error if epoch_boundary_block is a lie (#2758)

* Return error if epoch_boundary_block is not actually the epoch boundary block

* Update rpc-client-api/src/custom_error.rs

Co-authored-by: Trent Nelson <[email protected]>

---------

Co-authored-by: Trent Nelson <[email protected]>
(cherry picked from commit 9a4b094)

# Conflicts:
#	rpc-client-api/src/custom_error.rs
#	rpc/src/rpc.rs

* Fix conflicts

---------

Co-authored-by: Tyera <[email protected]>
behzadnouri pushed a commit to behzadnouri/solana that referenced this pull request Oct 10, 2024
…ackport of solana-labs#2758) (solana-labs#2781)

* RPC: rewards, return error if epoch_boundary_block is a lie (solana-labs#2758)

* Return error if epoch_boundary_block is not actually the epoch boundary block

* Update rpc-client-api/src/custom_error.rs

Co-authored-by: Trent Nelson <[email protected]>

---------

Co-authored-by: Trent Nelson <[email protected]>
(cherry picked from commit 9a4b094)

# Conflicts:
#	rpc-client-api/src/custom_error.rs
#	rpc/src/rpc.rs

* Fix conflicts

---------

Co-authored-by: Tyera <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants