Skip to content

Rustup #2535

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
Sep 7, 2022
Merged

Rustup #2535

merged 1 commit into from
Sep 7, 2022

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Sep 7, 2022

fix breakage in rust-lang/rust#101522

@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 7, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Sep 7, 2022

📌 Commit f9ff70c has been approved by oli-obk

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 7, 2022

⌛ Testing commit f9ff70c with merge ef3f649...

@bors
Copy link
Contributor

bors commented Sep 7, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing ef3f649 to master...

@bors bors merged commit ef3f649 into rust-lang:master Sep 7, 2022
@@ -5,6 +5,6 @@ fn main() {
unsafe {
std::intrinsics::assume(x < 10);
std::intrinsics::assume(x > 1);
std::intrinsics::assume(x > 42); //~ ERROR: `assume` intrinsic called with `false`
std::intrinsics::assume(x > 42); //~ ERROR: `assume` called with `false`
Copy link
Member

Choose a reason for hiding this comment

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

Given that it's StatementKind::Intrinsic, maybe we should make the error talk about intrinsics as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

😆 this is a change proposed by you, I had the intrinsic left in the name originally

Copy link
Member

Choose a reason for hiding this comment

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

Eh, hm... 🙈

@oli-obk oli-obk deleted the rustup branch September 7, 2022 16:01
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