Skip to content

Revert "fix: Ensure dep/feature activates the dependency on 2024" - #14295

Merged
bors merged 1 commit into
rust-lang:masterfrom
epage:revert
Jul 24, 2024
Merged

Revert "fix: Ensure dep/feature activates the dependency on 2024"#14295
bors merged 1 commit into
rust-lang:masterfrom
epage:revert

Conversation

@epage

@epage epage commented Jul 24, 2024

Copy link
Copy Markdown
Contributor

What does this PR try to resolve?

Fixes #14283 by re-opening #14016 so we don't block people testing other Edition 2024 changes.

How should we test and review this PR?

This reverts commit 99fae91.

I initially held off on reverting in case we quickly had a clear direction to go. Since we're still doing some investigation, I decided to move forward with this.

Additional information

@epage
Revert "fix: Ensure dep/feature activates the dependency on 2024"
407a32c 
Fixes rust-lang#14283 by re-opening rust-lang#14016 so we don't block people testing other
Edition 2024 changes.

This reverts commit 99fae91.
@rustbot

rustbot commented Jul 24, 2024

Copy link
Copy Markdown
Collaborator

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2024
@weihanglo

weihanglo commented Jul 24, 2024

Copy link
Copy Markdown
Member

Thanks for taking care of it.

@bors r+

@bors

bors commented Jul 24, 2024

Copy link
Copy Markdown
Contributor

📌 Commit 407a32c has been approved by weihanglo

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 Jul 24, 2024
@bors

bors commented Jul 24, 2024

Copy link
Copy Markdown
Contributor

⌛ Testing commit 407a32c with merge ca330a2...

@epage epage mentioned this pull request Jul 24, 2024
Open
@bors

bors commented Jul 24, 2024

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing ca330a2 to master...

@bors
bors merged commit ca330a2 into rust-lang:master Jul 24, 2024
@bors bors mentioned this pull request Jul 24, 2024
Merged
@epage
epage deleted the revert branch July 24, 2024 15:05
@weihanglo weihanglo mentioned this pull request Jul 27, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
c4f5a7b 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
a279fa1 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2024
@bors
Auto merge of rust-lang#128270 - weihanglo:update-cargo, r=weihanglo
385a74f 
Update cargo

14 commits in 5f6b9a92201d78af75dc24f14662c3e2dacbbbe1..b5d44db1daf0469b227a6211b987162a39a54730
2024-07-19 18:09:17 +0000 to 2024-07-26 21:27:12 +0000
- Package workspaces (rust-lang/cargo#13947)
- test: migrate messages to snapbox (rust-lang/cargo#14242)
- chore: Update dependencies (rust-lang/cargo#14299)
- fix: remove rustc probe for `--check-cfg` support (rust-lang/cargo#14302)
- Misc test clean up (rust-lang/cargo#14297)
- Don't downgrade on prerelease `VersionReq` when update with --breaking. (rust-lang/cargo#14250)
- test: Migrate some json tests to snapbox (rust-lang/cargo#14293)
- Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14295)
- chore: bump cargo-test-support to 0.4.0 (rust-lang/cargo#14286)
- Bump to 0.83.0; update changelog (rust-lang/cargo#14285)
- Improved error message when `update --breaking` invalid spec. (rust-lang/cargo#14279)
- docs(test): Expand documentation of cargo-test-support (rust-lang/cargo#14272)
- test: Fix some test based on rustc version (rust-lang/cargo#14282)
- Use `Rc` instead of `Arc` for storing rustflags (rust-lang/cargo#14273)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Jul 28, 2024
This was referenced Aug 6, 2024
Closed
Merged
bors added a commit that referenced this pull request Aug 14, 2024
@bors
Auto merge of #14366 - weihanglo:beta-1.81-backport, r=epage
2d826af 
[beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024"

Beta backports

* #14295

In order to make CI pass, the following PRs are also cherry-picked:

* Ignore `build_std::basic` test
* 830db6f (#14341)
bors added a commit that referenced this pull request Aug 14, 2024
@bors
Auto merge of #14366 - weihanglo:beta-1.81-backport, r=epage
d585829 
[beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024"

Beta backports

* #14295

In order to make CI pass, the following PRs are also cherry-picked:

* #14352
* Ignore `build_std::{cross_custom,custom_test_framework,remap_path_scope}` tests (see also #14368)
@ehuss ehuss mentioned this pull request Sep 11, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

Labels

A-manifest Area: Cargo.toml issues S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

Activation of features of non-optional dependencies breaks manifest for 2024 edition

4 participants

@epage @rustbot @weihanglo @bors