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

Revert "Improve heuristics whether format_args string is a source literal" #107041

Merged
merged 1 commit into from
Jan 19, 2023
Merged

Revert "Improve heuristics whether format_args string is a source literal" #107041

merged 1 commit into from
Jan 19, 2023

Conversation

Noratrieb
Copy link
Member

This reverts commit e6c02aa (from #106195).

Keeps the code improvements from the PR and the test (as a known-bug).

Works around #106408 while a proper fix is discussed more thoroughly in #106505, as proposed by @tmandry.

Reopens #106191

r? compiler-errors

@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 18, 2023
@Noratrieb
Copy link
Member Author

I manually tested that this does indeed fix the indoc issue.

Noratrieb
Noratrieb commented Jan 18, 2023
View reviewed changes
tests/ui/fmt/respanned-literal-issue-106191.rs Outdated
Comment on lines 10 to 13
// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> ""
// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> ""
// normalize-stderr-test "note: compiler flags.*\n\n" -> ""
// normalize-stderr-test "note: rustc.*running on.*\n\n" -> ""
Copy link
Member Author

@Noratrieb Noratrieb Jan 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

i just copied this from the chalkify/bugs/async.rs test

Copy link
Member

Choose a reason for hiding this comment

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

lol

@compiler-errors
Copy link
Member

r=me once ci is green

@bors p=1 since this should probably make the beta cutoff tomorrow

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb
Revert "Improve heuristics whether format_args string is a source l…
a8086cf 
…iteral"

This reverts commit e6c02aa.

Keeps the code improvements from the PR and the test (as a known-bug).
@Noratrieb Noratrieb force-pushed the back-to-being-clueless-whether-it-really-is-a-literal branch from b6319bd to a8086cf Compare January 18, 2023 19:33
@Noratrieb
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Jan 18, 2023

📌 Commit a8086cf has been approved by compiler-errors

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

bors commented Jan 18, 2023

⌛ Testing commit a8086cf with merge 8b11574...

@bors
Copy link
Contributor

bors commented Jan 19, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 8b11574 to master...

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

Finished benchmarking commit (8b11574): 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)		 2.5% [2.5%, 2.5%] 1
Improvements ✅
(primary)		 -0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)		 -4.2% [-4.2%, -4.2%] 1
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

Cycles

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)		 2.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

@Noratrieb Noratrieb deleted the back-to-being-clueless-whether-it-really-is-a-literal branch January 19, 2023 06:30
@Noratrieb Noratrieb mentioned this pull request Jan 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@compiler-errors compiler-errors

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.68.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Noratrieb @compiler-errors @rust-log-analyzer @bors @rust-timer @rustbot