Skip to content

fix: don't emit E0711 if staged_api not enabled #106627

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
Jan 17, 2023

Conversation

Ezrashaw
Copy link
Contributor

@Ezrashaw Ezrashaw commented Jan 9, 2023

Fixes #106589

Simple fix, added UI test.

As an aside, it seems a lot of features are susceptible to this, E0711 stands out to me because it's perma-unstable and we are effectively exposing an implementation detail.

@rustbot
Copy link
Collaborator

rustbot commented Jan 9, 2023

r? @eholk

(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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 9, 2023
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 11, 2023
@Ezrashaw Ezrashaw force-pushed the no-e0711-without-staged-api branch from 8041bff to f4afc42 Compare January 11, 2023 06:26
@Ezrashaw
Copy link
Contributor Author

Ezrashaw commented Jan 11, 2023

@Mark-Simulacrum I've applied your suggestion.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 12, 2023
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never (perf)

@bors
Copy link
Collaborator

bors commented Jan 14, 2023

📌 Commit f4afc42a0661e23cfcf1483ba54bc8c63e000644 has been approved by Mark-Simulacrum

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 Jan 14, 2023
@bors
Copy link
Collaborator

bors commented Jan 14, 2023

🔒 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 no-e0711-without-staged-api (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 no-e0711-without-staged-api --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
CONFLICT (file location): src/test/ui/stability-attribute/issue-106589.stderr added in heads/homu-tmp inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to tests/ui/stability-attribute/issue-106589.stderr.
CONFLICT (file location): src/test/ui/stability-attribute/issue-106589.rs added in heads/homu-tmp inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to tests/ui/stability-attribute/issue-106589.rs.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 27539 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 14, 2023
@Ezrashaw Ezrashaw force-pushed the no-e0711-without-staged-api branch from f4afc42 to be1a6db Compare January 14, 2023 09:05
@Ezrashaw
Copy link
Contributor Author

Ezrashaw commented Jan 14, 2023

@Mark-Simulacrum Had to rebase because src/test/ was moved to tests/.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2023
@jyn514
Copy link
Member

jyn514 commented Jan 17, 2023

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jan 17, 2023

📌 Commit be1a6db has been approved by Mark-Simulacrum

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 Jan 17, 2023
@bors
Copy link
Collaborator

bors commented Jan 17, 2023

⌛ Testing commit be1a6db with merge 159ba8a...

@bors
Copy link
Collaborator

bors commented Jan 17, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 159ba8a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2023
@bors bors merged commit 159ba8a into rust-lang:master Jan 17, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 17, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (159ba8a): 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)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.4% [4.4%, 4.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-5.9% [-5.9%, -5.9%] 1
All ❌✅ (primary) - - 0

Cycles

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

@Ezrashaw Ezrashaw deleted the no-e0711-without-staged-api branch February 28, 2023 07:40
@Ezrashaw Ezrashaw restored the no-e0711-without-staged-api branch May 3, 2024 08:11
@Ezrashaw Ezrashaw deleted the no-e0711-without-staged-api branch May 13, 2024 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

E0711 emitted even when staged_api is not enabled
7 participants