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

Fallback effects even if types also fallback #115859

Merged
merged 1 commit into from
Sep 15, 2023
Merged

Fallback effects even if types also fallback #115859

merged 1 commit into from
Sep 15, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Sep 14, 2023 •
edited
Loading

|| is short circuiting, so if we do ty/int var fallback, we don't do effect fallback 😸

r? @fee1-dead or @oli-obk

Fixes #115791
Fixes #115842

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 14, 2023
@fee1-dead
Copy link
Member

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 14, 2023

📌 Commit 5c907a7 has been approved by fee1-dead

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 Sep 14, 2023
@bors
Copy link
Contributor

bors commented Sep 15, 2023

⌛ Testing commit 5c907a7 with merge 5ad2d0d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 15, 2023
@bors
Auto merge of rust-lang#115859 - compiler-errors:effect-fallback, r=f…
5ad2d0d 
…ee1-dead

Fallback effects even if types also fallback

`||` is short circuiting, so if we do ty/int var fallback, we *don't* do effect fallback 😸

r? `@fee1-dead` or `@oli-obk`

Fixes rust-lang#115791
Fixes rust-lang#115842
@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
downloading https://static.rust-lang.org/dist/2023-08-22/cargo-beta-aarch64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/2023-08-22/rust-std-beta-aarch64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/2023-08-22/rustc-beta-aarch64-unknown-linux-gnu.tar.xz
extracting /checkout/obj/build/cache/2023-08-22/cargo-beta-aarch64-unknown-linux-gnu.tar.xz
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Fri Sep 15 00:01:51 UTC 2023
  network time: Fri, 15 Sep 2023 00:01:51 GMT
##[endgroup]
##[endgroup]
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.

@bors
Copy link
Contributor

bors commented Sep 15, 2023

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 15, 2023
@fee1-dead
Copy link
Member

@bors retry

@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 Sep 15, 2023
@bors
Copy link
Contributor

bors commented Sep 15, 2023

⌛ Testing commit 5c907a7 with merge ae9465f...

@bors
Copy link
Contributor

bors commented Sep 15, 2023

☀️ Test successful - checks-actions
Approved by: fee1-dead
Pushing ae9465f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 15, 2023
@bors bors merged commit ae9465f into rust-lang:master Sep 15, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Sep 15, 2023
@compiler-errors compiler-errors deleted the effect-fallback branch September 15, 2023 04:49
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ae9465f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 630.669s -> 631.97s (0.21%)
Artifact size: 318.13 MiB -> 318.10 MiB (-0.01%)

@fee1-dead fee1-dead mentioned this pull request Sep 18, 2023
Merged
@fee1-dead fee1-dead mentioned this pull request Dec 6, 2023
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fee1-dead fee1-dead

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.74.0
Development

Successfully merging this pull request may close these issues.

ICE error triggered by adding feature "effects" to code ICE: effects: is not fully resolved
6 participants
@compiler-errors @fee1-dead @bors @rust-log-analyzer @rust-timer @rustbot