Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Clean up the std library's #![feature]s #94546

Merged
merged 1 commit into from
Mar 5, 2022

Conversation

JmPotato
Copy link
Contributor

@JmPotato JmPotato commented Mar 3, 2022

Signed-off-by: JmPotato ghzpotato@gmail.com

This is part of #87766.

r? @m-ou-se

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @m-ou-se (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 3, 2022
@JmPotato
Copy link
Contributor Author

JmPotato commented Mar 3, 2022

@rustbot label C-cleanup, T-libs

@rustbot rustbot added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 3, 2022
@JmPotato JmPotato marked this pull request as draft March 3, 2022 06:39
@JmPotato JmPotato force-pushed the std-features-cleanup branch 2 times, most recently from f305e6f to d2dc6fc Compare March 3, 2022 06:52
@JmPotato JmPotato marked this pull request as ready for review March 3, 2022 06:53
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Mar 3, 2022

☔ The latest upstream changes (presumably #94548) made this pull request unmergeable. Please resolve the merge conflicts.

@JmPotato JmPotato force-pushed the std-features-cleanup branch from a38c4cc to afd996a Compare March 3, 2022 14:04
Copy link
Member

@m-ou-se m-ou-se left a comment

Choose a reason for hiding this comment

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

Thanks! Can you squash the commits?

@JmPotato JmPotato force-pushed the std-features-cleanup branch from afd996a to 42cb2ea Compare March 3, 2022 15:27
@JmPotato
Copy link
Contributor Author

JmPotato commented Mar 3, 2022

Thanks! Can you squash the commits?

Done. Thx for your review!

@m-ou-se
Copy link
Member

m-ou-se commented Mar 4, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 4, 2022

📌 Commit 42cb2ea has been approved by m-ou-se

@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 Mar 4, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? `@m-ou-se`
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? ``@m-ou-se``
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? ```@m-ou-se```
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? ````@m-ou-se````
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? `````@m-ou-se`````
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? `@m-ou-se`
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 4, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? ``@m-ou-se``
@Dylan-DPC
Copy link
Member

failed in rollup

@bors r-

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 5, 2022
…ou-se

Clean up the std library's #![feature]s

Signed-off-by: JmPotato <ghzpotato@gmail.com>

This is part of rust-lang#87766.

r? `@m-ou-se`
Signed-off-by: JmPotato <ghzpotato@gmail.com>
@JmPotato JmPotato force-pushed the std-features-cleanup branch from 42cb2ea to 9b952b7 Compare March 5, 2022 03:17
@JmPotato
Copy link
Contributor Author

JmPotato commented Mar 5, 2022

failed in rollup

@bors r-

@Dylan-DPC Hello, I just fixed the missing #![feature], and a rollup is needed again I think.

@Dylan-DPC
Copy link
Member

no worries, i'll r+ it and then it will either get merged individually or included in a rollup later today

@JmPotato
Copy link
Contributor Author

JmPotato commented Mar 5, 2022

no worries, i'll r+ it and then it will either get merged individually or included in a rollup later today

Maybe an individual merge is proper since the deleted #![feature]s could be fully tested and do not interfere with other PRs to merge?

@Dylan-DPC
Copy link
Member

@bors r=m-ou-se

@bors
Copy link
Collaborator

bors commented Mar 5, 2022

📌 Commit 9b952b7 has been approved by m-ou-se

@Dylan-DPC
Copy link
Member

@bors rollup=never

@bors
Copy link
Collaborator

bors commented Mar 5, 2022

⌛ Testing commit 9b952b7 with merge 86067bb...

@bors
Copy link
Collaborator

bors commented Mar 5, 2022

☀️ Test successful - checks-actions
Approved by: m-ou-se
Pushing 86067bb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 5, 2022
@bors bors merged commit 86067bb into rust-lang:master Mar 5, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 5, 2022
@JmPotato JmPotato deleted the std-features-cleanup branch March 5, 2022 10:22
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (86067bb): comparison url.

Summary: This benchmark run did not return any relevant results. 4 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 8, 2022
…, r=Dylan-DPC

Reverted atomic_mut_ptr feature removal causing compilation break

Fixes a regression introduced as part of rust-lang#94546

Std no longer compiles on nightly while using the following commnd:

export RUSTFLAGS='-C target-feature=+atomics,+bulk-memory'
cargo build --target wasm32-unknown-unknown -Z build-std=panic_abort,std

I can help add tests to avoid future breaks but i couldn't understand the test framework
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants