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.

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

fix(package): Ensure we can package directories ending with '.rs' #15240

Merged
merged 2 commits into from
Feb 28, 2025

Conversation

epage
Copy link
Contributor

@epage epage commented Feb 27, 2025

What does this PR try to resolve?

This likely only affects -Zpackage-workspace but it might have also broken dependencies whose path ends with .rs as
well

This broke in #14961

How should we test and review this PR?

Additional information

This might have also broken dependencies whose path ends with `.rs` as
well

This broke in rust-lang#14961
@rustbot
Copy link
Collaborator

rustbot commented Feb 27, 2025

r? @ehuss

rustbot has assigned @ehuss.
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 Feb 27, 2025
@epage epage added the regression-from-stable-to-beta Regression in beta that previously worked in stable. label Feb 27, 2025
@epage
Copy link
Contributor Author

epage commented Feb 27, 2025

Should we do a beta backport?

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.

Thanks!

@weihanglo
Copy link
Member

Should we do a beta backport?

If we want to be extra cautious, yes, though I cannot find a way to break any stable features.
I'll do the remaining work if you open a beta backport PR.

@weihanglo weihanglo added this pull request to the merge queue Feb 28, 2025
Merged via the queue into rust-lang:master with commit d5b25b8 Feb 28, 2025
21 checks passed
@epage epage deleted the script branch February 28, 2025 14:34
@epage
Copy link
Contributor Author

epage commented Feb 28, 2025

Confirmed: this is visible with stable behavior.

$ cargo new foo --lib
$ mv foo foo.rs
$ cargo add --path foo.rs
$ cargo check
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.03s
$ cargo +nightly check
error: failed to get `foo` as a dependency of package `cargo-15240 v0.1.0 (/home/epage/src/personal/dump/cargo-15240)`

Caused by:
  failed to load source for dependency `foo`

Caused by:
  Unable to update /home/epage/src/personal/dump/cargo-15240/foo.rs

Caused by:
  Single file packages cannot be used as dependencies
$ nargo check
    Finished `dev` profile [unoptimized + debuginfo] target(s) in 0.02s

@weihanglo weihanglo added the beta-nominated Nominated to backport to the beta branch. label Feb 28, 2025
weihanglo added a commit to weihanglo/cargo that referenced this pull request Mar 1, 2025
…st-lang#15240)

### What does this PR try to resolve?

This likely only affects `-Zpackage-workspace` but it might have also
broken dependencies whose path ends with `.rs` as
well

This broke in rust-lang#14961

### How should we test and review this PR?

### Additional information
@weihanglo
Copy link
Member

Beta backport submitted: #15248

epage added a commit that referenced this pull request Mar 1, 2025
Beta backports

* #15240 

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

*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-manifest Area: Cargo.toml issues beta-nominated Nominated to backport to the beta branch. regression-from-stable-to-beta Regression in beta that previously worked in stable. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants