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 "feat: Add CARGO_RUSTC_CURRENT_DIR" #14799

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Revert "feat: Add CARGO_RUSTC_CURRENT_DIR" #14799

merged 1 commit into from
Nov 8, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Nov 8, 2024 •
edited by weihanglo
Loading

What does this PR try to resolve?

This reverts commit e81d84c.

We decided to not stabilize this in #13644.

How should we test and review this PR?

Additional information

This does not fix the underlying issue of #14798

@rustbot
Copy link
Collaborator

rustbot commented Nov 8, 2024

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-build-execution Area: anything dealing with executing the compiler A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 8, 2024
weihanglo
weihanglo approved these changes Nov 8, 2024
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

While this is not a fix for #14798, it is something we should do. I'll try finding a proper fix for #14798.

@weihanglo weihanglo enabled auto-merge November 8, 2024 21:10
@weihanglo weihanglo added this pull request to the merge queue Nov 8, 2024
Merged via the queue into rust-lang:master with commit 286b6d0 Nov 8, 2024
20 checks passed
@epage epage deleted the current-dir branch November 8, 2024 22:02
@weihanglo weihanglo mentioned this pull request Nov 9, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
@bors
Auto merge of rust-lang#132829 - weihanglo:update-cargo, r=weihanglo
303fc05 
Update cargo

16 commits in 0310497822a7a673a330a5dd068b7aaa579a265e..4a2d8dc636445b276288543882e076f254b3ae95
2024-11-01 19:27:56 +0000 to 2024-11-09 19:10:33 +0000
- test: adjust `cargo_test_env` to unblock rust submodule update (rust-lang/cargo#14803)
- feat(warnings): add build.warnings option (rust-lang/cargo#14388)
- Revert "feat: Add `CARGO_RUSTC_CURRENT_DIR`" (rust-lang/cargo#14799)
- CI: make the `lint-docs` job required (rust-lang/cargo#14797)
- Switch CI from bors to merge queue (rust-lang/cargo#14718)
- docs(test):  Document Execs assertions based on port effort (rust-lang/cargo#14793)
- fix(test): Make redactions consistent with snapbox (rust-lang/cargo#14790)
- test(gc): Update remaining unordered tests to snapbox (rust-lang/cargo#14785)
- Normalize the `target` paths (rust-lang/cargo#14497)
- rustfix: replace special-case duplicate handling with error (rust-lang/cargo#14782)
- test: Update some emaining unordered tests to snapbox (rust-lang/cargo#14781)
- Change config paths to only check CARGO_HOME for cargo-script (rust-lang/cargo#14749)
- Enable transfer feature in triagebot (rust-lang/cargo#14777)
- Add transactional semantics to `rustfix` (rust-lang/cargo#14747)
- doc: fix `GlobalContext` reference (rust-lang/cargo#14773)
- chore: update handlebars to v6, fix build error (rust-lang/cargo#14772)
@rustbot rustbot added this to the 1.84.0 milestone Nov 10, 2024
mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
@bors @mati865
Auto merge of rust-lang#132829 - weihanglo:update-cargo, r=weihanglo
b5e0764 
Update cargo

16 commits in 0310497822a7a673a330a5dd068b7aaa579a265e..4a2d8dc636445b276288543882e076f254b3ae95
2024-11-01 19:27:56 +0000 to 2024-11-09 19:10:33 +0000
- test: adjust `cargo_test_env` to unblock rust submodule update (rust-lang/cargo#14803)
- feat(warnings): add build.warnings option (rust-lang/cargo#14388)
- Revert "feat: Add `CARGO_RUSTC_CURRENT_DIR`" (rust-lang/cargo#14799)
- CI: make the `lint-docs` job required (rust-lang/cargo#14797)
- Switch CI from bors to merge queue (rust-lang/cargo#14718)
- docs(test):  Document Execs assertions based on port effort (rust-lang/cargo#14793)
- fix(test): Make redactions consistent with snapbox (rust-lang/cargo#14790)
- test(gc): Update remaining unordered tests to snapbox (rust-lang/cargo#14785)
- Normalize the `target` paths (rust-lang/cargo#14497)
- rustfix: replace special-case duplicate handling with error (rust-lang/cargo#14782)
- test: Update some emaining unordered tests to snapbox (rust-lang/cargo#14781)
- Change config paths to only check CARGO_HOME for cargo-script (rust-lang/cargo#14749)
- Enable transfer feature in triagebot (rust-lang/cargo#14777)
- Add transactional semantics to `rustfix` (rust-lang/cargo#14747)
- doc: fix `GlobalContext` reference (rust-lang/cargo#14773)
- chore: update handlebars to v6, fix build error (rust-lang/cargo#14772)
weihanglo added a commit to weihanglo/cargo that referenced this pull request Nov 29, 2024
@weihanglo
test: remove the use of CARGO_RUSTC_CURRENT_DIR
6c6a6b1 
The environment variable has been removed in rust-lang#14799
Switch to plain old `CARGO_MANIFEST_DIR` instead.

See also build failures in rust-lang/rust#133533
weihanglo added a commit to weihanglo/cargo that referenced this pull request Nov 29, 2024
@weihanglo
test: remove the use of CARGO_RUSTC_CURRENT_DIR
1e9bce1 
The environment variable has been removed in rust-lang#14799.
Switch to plain old `CARGO_MANIFEST_DIR`
because snapbox's `current_rs` favors furthest Cargo.toml,
blocking tests running in rust-lang/rust as a submodule.

See also build failures in rust-lang/rust#133533
@epage epage mentioned this pull request Nov 29, 2024
Merged
weihanglo added a commit to weihanglo/cargo that referenced this pull request Nov 29, 2024
@weihanglo
test: remove the use of CARGO_RUSTC_CURRENT_DIR
fcbf790 
The environment variable has been removed in rust-lang#14799.
Switch to plain old `CARGO_MANIFEST_DIR`
because snapbox's `current_rs` favors furthest Cargo.toml,
blocking tests running in rust-lang/rust as a submodule.

See also build failures in rust-lang/rust#133533
@weihanglo weihanglo mentioned this pull request Nov 29, 2024
Closed
weihanglo added a commit to weihanglo/cargo that referenced this pull request Nov 29, 2024
@weihanglo
test: remove the use of CARGO_RUSTC_CURRENT_DIR
17b642f 
The environment variable has been removed in rust-lang#14799.
Switch to plain old `CARGO_MANIFEST_DIR`
because snapbox's `current_rs` favors furthest Cargo.toml,
blocking tests running in rust-lang/rust as a submodule.

See also build failures in rust-lang/rust#133533
weihanglo added a commit to weihanglo/cargo that referenced this pull request Nov 29, 2024
@weihanglo
test: remove the use of CARGO_RUSTC_CURRENT_DIR
da846c6 
The environment variable has been removed in rust-lang#14799.
Switch to plain old `CARGO_MANIFEST_DIR`
because snapbox's `current_rs` favors furthest Cargo.toml,
blocking tests running in rust-lang/rust as a submodule.

See also build failures in rust-lang/rust#133533
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-build-execution Area: anything dealing with executing the compiler A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
3 participants
@epage @rustbot @weihanglo