Skip to content

Update serde crates and their dependencies #1657

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

Merged
merged 1 commit into from
Mar 13, 2019

Conversation

jtgeibel
Copy link
Member

cargo update -p serde -p serde_json -p serde_urlencoded -p serde_derive --aggressive

All serde crates and their dependencies are updated:

    Updating dtoa v0.4.2 -> v0.4.3
    Updating idna v0.1.4 -> v0.1.5
    Removing itoa v0.3.4
    Updating matches v0.1.6 -> v0.1.8
    Removing num-traits v0.1.40
      Adding num-traits v0.1.43
      Adding num-traits v0.2.6
    Updating percent-encoding v1.0.0 -> v1.0.1
    Updating proc-macro2 v0.4.6 -> v0.4.27
    Updating quote v0.6.3 -> v0.6.11
      Adding ryu v0.2.7
    Updating serde v1.0.80 -> v1.0.89
    Updating serde_derive v1.0.80 -> v1.0.89
    Updating serde_json v1.0.5 -> v1.0.39
    Updating serde_urlencoded v0.5.3 -> v0.5.4
    Updating syn v0.15.13 -> v0.15.29
    Updating unicode-normalization v0.1.5 -> v0.1.8
    Updating url v1.6.0 -> v1.7.2

@bors
Copy link
Contributor

bors commented Mar 10, 2019

☔ The latest upstream changes (presumably #1656) made this pull request unmergeable. Please resolve the merge conflicts.

@sgrif
Copy link
Contributor

sgrif commented Mar 12, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit 8268a79 has been approved by sgrif

@bors
Copy link
Contributor

bors commented Mar 12, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update/serde (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update/serde --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Mar 12, 2019

☔ The latest upstream changes (presumably #1664) made this pull request unmergeable. Please resolve the merge conflicts.

…ive --aggressive`

All serde crates and their dependencies are updated:

```
    Updating dtoa v0.4.2 -> v0.4.3
    Updating idna v0.1.4 -> v0.1.5
    Removing itoa v0.3.4
    Updating matches v0.1.6 -> v0.1.8
    Removing num-traits v0.1.40
      Adding num-traits v0.1.43
      Adding num-traits v0.2.6
    Updating percent-encoding v1.0.0 -> v1.0.1
    Updating proc-macro2 v0.4.6 -> v0.4.27
    Updating quote v0.6.3 -> v0.6.11
      Adding ryu v0.2.7
    Updating serde v1.0.80 -> v1.0.89
    Updating serde_derive v1.0.80 -> v1.0.89
    Updating serde_json v1.0.5 -> v1.0.39
    Updating serde_urlencoded v0.5.3 -> v0.5.4
    Updating syn v0.15.13 -> v0.15.29
    Updating unicode-normalization v0.1.5 -> v0.1.8
    Updating url v1.6.0 -> v1.7.2
```
@jtgeibel
Copy link
Member Author

Rebased to resolve merge conflicts.

@bors r+

@bors
Copy link
Contributor

bors commented Mar 12, 2019

📌 Commit c8a6f62 has been approved by jtgeibel

@bors
Copy link
Contributor

bors commented Mar 12, 2019

⌛ Testing commit c8a6f62 with merge cf157df...

bors added a commit that referenced this pull request Mar 12, 2019
Update serde crates and their dependencies

`cargo update -p serde -p serde_json -p serde_urlencoded -p serde_derive --aggressive`

All serde crates and their dependencies are updated:

```
    Updating dtoa v0.4.2 -> v0.4.3
    Updating idna v0.1.4 -> v0.1.5
    Removing itoa v0.3.4
    Updating matches v0.1.6 -> v0.1.8
    Removing num-traits v0.1.40
      Adding num-traits v0.1.43
      Adding num-traits v0.2.6
    Updating percent-encoding v1.0.0 -> v1.0.1
    Updating proc-macro2 v0.4.6 -> v0.4.27
    Updating quote v0.6.3 -> v0.6.11
      Adding ryu v0.2.7
    Updating serde v1.0.80 -> v1.0.89
    Updating serde_derive v1.0.80 -> v1.0.89
    Updating serde_json v1.0.5 -> v1.0.39
    Updating serde_urlencoded v0.5.3 -> v0.5.4
    Updating syn v0.15.13 -> v0.15.29
    Updating unicode-normalization v0.1.5 -> v0.1.8
    Updating url v1.6.0 -> v1.7.2
```
@bors
Copy link
Contributor

bors commented Mar 13, 2019

☀️ Test successful - checks-travis
Approved by: jtgeibel
Pushing cf157df to master...

@bors bors merged commit c8a6f62 into rust-lang:master Mar 13, 2019
@jtgeibel jtgeibel deleted the update/serde branch July 14, 2019 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants