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.

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

Update compiler-builtins #104372

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Update compiler-builtins #104372

merged 1 commit into from
Nov 15, 2022

Conversation

Ayush1325
Copy link
Contributor

This was originally a part of #100316. However, extracting it to a seperate PR should help with any extra testing that might be needed.

Signed-off-by: Ayush Singh ayushsingh1325@gmail.com

@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2022

r? @joshtriplett

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 13, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@klensy
Copy link
Contributor

klensy commented Nov 13, 2022

It's already 0.1.82

rust/Cargo.lock

Lines 781 to 789 in afd7977

[[package]]
name = "compiler_builtins"
version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18cd7635fea7bb481ea543b392789844c1ad581299da70184c7175ce3af76603"
dependencies = [
"cc",
"rustc-std-workspace-core",
]

@Ayush1325
Copy link
Contributor Author

It's already 0.1.82

rust/Cargo.lock

Lines 781 to 789 in afd7977

[[package]]
name = "compiler_builtins"
version = "0.1.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18cd7635fea7bb481ea543b392789844c1ad581299da70184c7175ce3af76603"
dependencies = [
"cc",
"rustc-std-workspace-core",
]

Shouldn't the version in Cargo.toml be bumped up to 0.1.82 as well then? Also, is it fine to have a version mismatch between Cargo.lock and Cargo.toml?

@Ayush1325
Update compiler-builtins
cd2fb43 
This was originally a part of rust-lang#100316.
However, extracting it to a seperate PR should help with any extra
testing that might be needed.

Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
@JohnTitor
Copy link
Member

Shouldn't the version in Cargo.toml be bumped up to 0.1.82 as well then? Also, is it fine to have a version mismatch between Cargo.lock and Cargo.toml?

Don't have to be, but some team members prefer to sync a version with one on the lockfile not to downgrade accidentally and I think there's no reason to reject this PR.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 14, 2022

📌 Commit cd2fb43 has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 15, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2022
@bors
Auto merge of rust-lang#104428 - matthiaskrgr:rollup-jo3078i, r=matth…
ca92d90 
…iaskrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#103842 (Adding Fuchsia compiler testing script, docs)
 - rust-lang#104354 (Remove leading newlines from `NonZero*` doc examples)
 - rust-lang#104372 (Update compiler-builtins)
 - rust-lang#104380 (rustdoc: remove unused CSS `code { opacity: 1 }`)
 - rust-lang#104381 (Remove dead NoneError diagnostic handling)
 - rust-lang#104383 (Remove unused symbols and diagnostic items)
 - rust-lang#104391 (Deriving cleanups)
 - rust-lang#104403 (Specify language of code comment to generate document)
 - rust-lang#104404 (Fix missing minification for static files)
 - rust-lang#104413 ([llvm-wrapper] adapt for LLVM API change)
 - rust-lang#104415 (rustdoc: fix corner case in search keyboard commands)
 - rust-lang#104422 (Fix suggest associated call syntax)
 - rust-lang#104426 (Add test for rust-lang#102154)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 83b6e85 into rust-lang:master Nov 15, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 15, 2022
@Ayush1325 Ayush1325 deleted the compiler-builtins branch November 15, 2022 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@joshtriplett joshtriplett

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Ayush1325 @rustbot @klensy @JohnTitor @bors @joshtriplett