Skip to content

Bump backend dependencies and to latest stable rustc #3849

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 30, 2021
Merged

Bump backend dependencies and to latest stable rustc #3849

merged 2 commits into from
Aug 30, 2021

Conversation

jtgeibel
Copy link
Member

@Turbo87
Copy link
Member

Turbo87 commented Aug 19, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Aug 19, 2021

📌 Commit e63bd67 has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Aug 19, 2021

🔒 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/rustc (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/rustc --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 .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Aug 19, 2021

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

@jtgeibel
Copy link
Member Author

I've resolved the merge conflict, but I think we'll want to deploy this separately from the rest of our backlog, so let's hold off on merging for now.

@nipunn1313 nipunn1313 mentioned this pull request Aug 24, 2021
Merged
nipunn1313
nipunn1313 reviewed Aug 24, 2021
View reviewed changes
.github/workflows/ci.yml
@@ -91,8 +91,8 @@ jobs:
run: |
rustup set profile minimal
# Pin to older version until a clippy regression is fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment seems to imply that it's desired to switch back to rustup update stable - which from git log history appears to be how it used to work.

Do you want to use

rustup update stable
rustup default stable

Alternately, remove this comment about pinning an older version?

@jtgeibel @Turbo87
cargo update
a20c3ea 
Also manually bumped to the latest `clap` beta.

```
Updating addr2line v0.15.2 -> v0.16.0
Updating ammonia v3.1.1 -> v3.1.2
Updating anyhow v1.0.41 -> v1.0.43
Updating backtrace v0.3.60 -> v0.3.61
Removing base64 v0.12.3
Updating bitflags v1.2.1 -> v1.3.2
Updating cc v1.0.68 -> v1.0.69
Updating clap v3.0.0-beta.2 -> v3.0.0-beta.4
Updating clap_derive v3.0.0-beta.2 -> v3.0.0-beta.4
Updating cookie v0.15.0 -> v0.15.1
Updating crypto-mac v0.10.0 -> v0.10.1
Updating fastrand v1.4.1 -> v1.5.0
Updating filetime v0.2.14 -> v0.2.15
Updating futures-channel v0.3.15 -> v0.3.16
Updating futures-core v0.3.15 -> v0.3.16
Updating futures-io v0.3.15 -> v0.3.16
Updating futures-macro v0.3.15 -> v0.3.16
Updating futures-sink v0.3.15 -> v0.3.16
Updating futures-task v0.3.15 -> v0.3.16
Updating futures-util v0.3.15 -> v0.3.16
Updating gimli v0.24.0 -> v0.25.0
Updating git2 v0.13.20 -> v0.13.21
Updating hashbrown v0.9.1 -> v0.11.2
Updating http-body v0.4.2 -> v0.4.3
Updating httparse v1.4.1 -> v1.5.0
Updating hyper v0.14.9 -> v0.14.11
Updating indexmap v1.6.2 -> v1.7.0
Updating instant v0.1.9 -> v0.1.10
Updating jobserver v0.1.22 -> v0.1.24
Updating js-sys v0.3.51 -> v0.3.52
Updating libc v0.2.97 -> v0.2.99
Updating libgit2-sys v0.12.21+1.1.0 -> v0.12.22+1.1.0
Updating matches v0.1.8 -> v0.1.9
Updating memchr v2.4.0 -> v2.4.1
Updating native-tls v0.2.7 -> v0.2.8
Updating oauth2 v4.0.0 -> v4.1.0
Updating object v0.25.3 -> v0.26.1
Updating openssl v0.10.35 -> v0.10.36
Updating openssl-sys v0.9.65 -> v0.9.66
Updating os_str_bytes v2.4.0 -> v3.1.0
Updating proc-macro2 v1.0.27 -> v1.0.28
Updating protobuf v2.24.1 -> v2.25.0
Updating redox_syscall v0.2.9 -> v0.2.10
Updating semver v1.0.3 -> v1.0.4
Updating serde v1.0.126 -> v1.0.127
Updating serde_derive v1.0.126 -> v1.0.127
Updating serde_json v1.0.64 -> v1.0.66
Updating sha-1 v0.9.6 -> v0.9.7
Updating sharded-slab v0.1.1 -> v0.1.3
Updating siphasher v0.3.5 -> v0.3.6
Updating slab v0.4.3 -> v0.4.4
Updating socket2 v0.4.0 -> v0.4.1
Updating subtle v2.4.0 -> v2.4.1
Updating syn v1.0.73 -> v1.0.74
Updating tar v0.4.35 -> v0.4.37
Updating textwrap v0.12.1 -> v0.14.2
Updating thiserror v1.0.25 -> v1.0.26
Updating thiserror-impl v1.0.25 -> v1.0.26
Updating tinyvec v1.2.0 -> v1.3.1
Updating tokio v1.7.1 -> v1.10.0
Updating tokio-macros v1.2.0 -> v1.3.0
Updating tokio-stream v0.1.6 -> v0.1.7
Updating tracing-core v0.1.18 -> v0.1.19
Updating tracing-subscriber v0.2.19 -> v0.2.20
Updating unicode-bidi v0.3.5 -> v0.3.6
Updating unicode-segmentation v1.7.1 -> v1.8.0
Updating universal-hash v0.4.0 -> v0.4.1
Updating wasm-bindgen v0.2.74 -> v0.2.75
Updating wasm-bindgen-backend v0.2.74 -> v0.2.75
Updating wasm-bindgen-futures v0.4.24 -> v0.4.25
Updating wasm-bindgen-macro v0.2.74 -> v0.2.75
Updating wasm-bindgen-macro-support v0.2.74 -> v0.2.75
Updating wasm-bindgen-shared v0.2.74 -> v0.2.75
Updating web-sys v0.3.51 -> v0.3.52
Updating zeroize v1.3.0 -> v1.4.1
```
@jtgeibel @Turbo87
Bump to latest rustc stable
8ee134c
@Turbo87
Copy link
Member

Turbo87 commented Aug 28, 2021

@jtgeibel FYI I've rebased the branch. Should be ready to go from my side. Feel free to r=me.

@jtgeibel
Copy link
Member Author

Thanks!

@bors r=@Turbo87

@bors
Copy link
Contributor

bors commented Aug 30, 2021

📌 Commit 8ee134c has been approved by Turbo87

@bors
Copy link
Contributor

bors commented Aug 30, 2021

⌛ Testing commit 8ee134c with merge abacb64...

@bors
Copy link
Contributor

bors commented Aug 30, 2021

☀️ Test successful - checks-actions
Approved by: Turbo87
Pushing abacb64 to master...

@bors bors merged commit abacb64 into rust-lang:master Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nipunn1313 nipunn1313 nipunn1313 left review comments

Assignees

@Turbo87 Turbo87

Labels
A-backend ⚙️
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jtgeibel @Turbo87 @bors @nipunn1313 @rust-highfive