[testsuite][cleanup] Remove all usages of dont_merge hack to avoid function merging #129468
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| rustbot has assigned @Mark-Simulacrum. Use |
rustbot added the S-waiting-on-review 
This comment has been minimized.
This comment has been minimized.
Yes, but you still need to add this flag to the tests you're removing the hacks from, presumably? |
Rajveer100 force-pushed the hack-to-avoid-function-merging branch from ca502db to 7453128 Compare 
| Missed it :) |
| @compiler-errors The tests are fixed now. |
| ☔ The latest upstream changes (presumably #129647) made this pull request unmergeable. Please resolve the merge conflicts. |
Rajveer100 force-pushed the hack-to-avoid-function-merging branch 4 times, most recently from dd2a955 to 800a1ce Compare This comment has been minimized.
This comment has been minimized.
…function merging Resolves rust-lang#129438 The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Rajveer100 force-pushed the hack-to-avoid-function-merging branch from 800a1ce to b324fcb Compare 
| @bors r+ rollup=iffy |
bors added S-waiting-on-bors 
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#128871 (bypass linker configuration and cross target check for specific commands) - rust-lang#129468 ([testsuite][cleanup] Remove all usages of `dont_merge` hack to avoid function merging) - rust-lang#129614 (Adjust doc comment of Condvar::wait_while) - rust-lang#129840 (Implement suggestions for `elided_named_lifetimes`) - rust-lang#129891 (Do not request sanitizers for naked functions) - rust-lang#129899 (Add Suggestions for Misspelled Keywords) - rust-lang#129940 (s390x: Fix a regression related to backchain feature) - rust-lang#129987 (Don't store region in `CapturedPlace`) - rust-lang#130054 (Add missing quotation marks) r? `@ghost` `@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#128871 (bypass linker configuration and cross target check for specific commands) - rust-lang#129468 ([testsuite][cleanup] Remove all usages of `dont_merge` hack to avoid function merging) - rust-lang#129614 (Adjust doc comment of Condvar::wait_while) - rust-lang#129840 (Implement suggestions for `elided_named_lifetimes`) - rust-lang#129891 (Do not request sanitizers for naked functions) - rust-lang#129899 (Add Suggestions for Misspelled Keywords) - rust-lang#129940 (s390x: Fix a regression related to backchain feature) - rust-lang#129987 (Don't store region in `CapturedPlace`) - rust-lang#130054 (Add missing quotation marks) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 7, 2024
Rollup merge of rust-lang#129468 - Rajveer100:hack-to-avoid-function-merging, r=Mark-Simulacrum [testsuite][cleanup] Remove all usages of `dont_merge` hack to avoid function merging Resolves rust-lang#129438 The `-Zmerge-functions=disabled` compile flag exists for this purpose.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
Resolves #129438
The
-Zmerge-functions=disabledcompile flag exists for this purpose.