Support glob syntax in workspace members #3979

hjr3 · 2017-04-29T18:25:57Z

rust-highfive · 2017-04-29T18:26:08Z

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

matklad · 2017-05-02T11:17:16Z

src/cargo/core/workspace.rs

+            }
+
+            for path in expanded_list {
+                let manifest_path = path.join("Cargo.toml");


Will this error if there's a path without Cargo.toml matched by the glob? I would say that it's OK to bail in this case, but that just skipping that path would be probably more useful: I often have various assorted folders alongside the workspace packages.

In any case, I think a test case for this would be useful :)

Good call out. I will get on it.

alexcrichton · 2017-05-02T14:21:55Z

Thanks for the PR @hjr3! Looks good to me but I'd share the same concerns as @matklad, mayb ejust add a test to see what the error looks like?

alexcrichton · 2017-05-02T14:22:09Z

Also mind updating the workspace documentation to mention that globs may be used?

hjr3 · 2017-05-02T14:22:50Z

@alexcrichton sure, i can update the docs too!

nipunn1313 · 2017-05-04T22:23:07Z

Thanks @hjr3! I'm looking forward to this one (we currently have a big setup with a script to autogenerate the workspace members).

hjr3 · 2017-05-07T06:38:13Z

Apologies for taking so long to update this PR. I have updated the docs. Is it ok to reuse the globs URL like I did? It renders correctly with my testing.

I also added the test to shows what happens with a workspace path does not have a Cargo.toml file. As expected, it throws an error. I would expect that someone would add that to the exclude array though. Is that good enough? If it is, does the error message need to be improved? Should I mention that in the docs?

alexcrichton · 2017-05-08T14:42:07Z

Looks good to me, but the tests seem to be failing? The new invalid_members test also seems to not have an error message :(

- fix glob missing members test to use proper expectations - update code to handle case where glob does not match anything

hjr3 · 2017-05-09T05:35:30Z

@alexcrichton ok i fixed glob_syntax_invalid_members to have the proper expectations. The invalid_members test was failing because that member path does not actually exist and the glob will ignore it. If expanded the member path returns an empty list, I default to the original (non-expanded) value. That could be weird in some cases though if someone specifies a pattern that does not match anything. It might be better to return an error if the pattern does not match anything?

alexcrichton · 2017-05-09T16:57:11Z

src/cargo/core/workspace.rs

@@ -527,6 +544,18 @@ impl<'cfg> Workspace<'cfg> {
    }
 }

+fn expand_member_path(path: &Path) -> CargoResult<Vec<PathBuf>> {
+    let path = path.to_str().unwrap();


Could the None case be handled here instead of unwrap? (returning an empty Vec)

alexcrichton · 2017-05-09T16:57:27Z

src/cargo/core/workspace.rs

@@ -527,6 +544,18 @@ impl<'cfg> Workspace<'cfg> {
    }
 }

+fn expand_member_path(path: &Path) -> CargoResult<Vec<PathBuf>> {
+    let path = path.to_str().unwrap();
+    let res = glob(path).map_err(|e| {


Could this use .chain_error instead of .map_err?

I may be missing something here, but I don't see how .chain_error can be used with Result<glob::Paths, glob::PatternError>.

alexcrichton · 2017-05-09T16:57:41Z

src/cargo/core/workspace.rs

+        human(format!("could not parse pattern `{}`: {}", &path, e))
+    })?;
+    res.map(|p| {
+        p.or_else(|e| {


As above, could this use chain_error?

alexcrichton · 2017-05-09T16:58:04Z

Nah this seems like a reasonable interpretation to me I think, thanks!

alexcrichton · 2017-05-10T14:52:22Z

@hjr3 mind updating to using chain_error instead of map_err in a few locations as well?

alexcrichton · 2017-05-16T15:05:45Z

@bors: r+

bors · 2017-05-16T15:05:46Z

📌 Commit f00c223 has been approved by alexcrichton

hjr3 · 2017-05-16T19:36:36Z

@alexcrichton thanks, i was just about to push this same patch. it took me some time to figure out how to get the chain_error working for glob.

bors · 2017-05-16T22:16:14Z

⌛ Testing commit f00c223 with merge 828a9c5...

Support glob syntax in workspace members Fixes #3911

alexcrichton · 2017-05-16T23:33:09Z

Oh sorry about that! I was just going through old Cargo PRs and figured this could use a bit of a boost :)

bors · 2017-05-16T23:44:35Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 828a9c5 to master...

Astlaan · 2024-02-16T22:42:18Z

How to use?

[workspace]

members = [
    "./*"
]

gives an error

Rustin170506 · 2024-02-17T06:06:20Z

@Astlaan What is the error? Could you please open a new issue instead of leaving a comment here, as this PR was closed 7 years ago.

If it is a usage issue, https://users.rust-lang.org/ may be a better place to ask this type of question.

Astlaan · 2024-02-17T16:48:55Z

@Astlaan What is the error? Could you please open a new issue instead of leaving a comment here, as this PR was closed 7 years ago.

If it is a usage issue, https://users.rust-lang.org/ may be a better place to ask this type of question.

Sorry, this is what I wrote:

[workspace]

members = [
    "./*"
]

But apparently with fails with an error like:

cargo check
error: failed to load manifest for workspace member C:\Users\user\Documents\ProjectA\.\.git

Caused by:
  failed to read `C:\Users\user\Documents\ProjectA\ .git\Cargo.toml

It's it possible to have it not fail and simply add as members folders that do have a Cargo.toml?

weihanglo · 2024-02-17T17:03:00Z

@Astlaan you can use workspace.exclude to exclude folder not intended to be a member.

See #11405 for tracking the workspace globbing issue

Support glob syntax in workspace members

b3a747c

Fixes rust-lang#3911

rust-highfive assigned alexcrichton Apr 29, 2017

matklad reviewed May 2, 2017

View reviewed changes

alexcrichton added the relnotes Release-note worthy label May 2, 2017

hjr3 added 2 commits May 6, 2017 23:33

Update workspace docs to include globs

229627a

Add test with workspace path that has no Cargo.toml

06a1371

fixes

9817033

- fix glob missing members test to use proper expectations - update code to handle case where glob does not match anything

alexcrichton reviewed May 9, 2017

View reviewed changes

fix - remove unwrap

ea2df45

Use a few more chain_error calls

f00c223

bors added a commit that referenced this pull request May 16, 2017

Auto merge of #3979 - hjr3:issue-3911, r=alexcrichton

828a9c5

Support glob syntax in workspace members Fixes #3911

bors merged commit f00c223 into rust-lang:master May 16, 2017

bors mentioned this pull request May 16, 2017

Clarify docs on workspace members #3967

Closed

hjr3 mentioned this pull request Aug 3, 2017

Improve build.rs to not add extra files steveklabnik/rustdoc#58

Closed

ehuss added this to the 1.19.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support glob syntax in workspace members #3979

Support glob syntax in workspace members #3979

hjr3 commented Apr 29, 2017

rust-highfive commented Apr 29, 2017

matklad May 2, 2017

hjr3 May 2, 2017

alexcrichton commented May 2, 2017

alexcrichton commented May 2, 2017

hjr3 commented May 2, 2017

nipunn1313 commented May 4, 2017

hjr3 commented May 7, 2017

alexcrichton commented May 8, 2017

hjr3 commented May 9, 2017

alexcrichton May 9, 2017

hjr3 May 10, 2017

alexcrichton May 9, 2017

hjr3 May 10, 2017

alexcrichton May 9, 2017

alexcrichton commented May 9, 2017

alexcrichton commented May 10, 2017

alexcrichton commented May 16, 2017

bors commented May 16, 2017

hjr3 commented May 16, 2017

bors commented May 16, 2017

alexcrichton commented May 16, 2017

bors commented May 16, 2017

Astlaan commented Feb 16, 2024

Rustin170506 commented Feb 17, 2024

Astlaan commented Feb 17, 2024 •

edited

Loading

weihanglo commented Feb 17, 2024

Support glob syntax in workspace members #3979

Support glob syntax in workspace members #3979

Conversation

hjr3 commented Apr 29, 2017

rust-highfive commented Apr 29, 2017

matklad May 2, 2017

Choose a reason for hiding this comment

hjr3 May 2, 2017

Choose a reason for hiding this comment

alexcrichton commented May 2, 2017

alexcrichton commented May 2, 2017

hjr3 commented May 2, 2017

nipunn1313 commented May 4, 2017

hjr3 commented May 7, 2017

alexcrichton commented May 8, 2017

hjr3 commented May 9, 2017

alexcrichton May 9, 2017

Choose a reason for hiding this comment

hjr3 May 10, 2017

Choose a reason for hiding this comment

alexcrichton May 9, 2017

Choose a reason for hiding this comment

hjr3 May 10, 2017

Choose a reason for hiding this comment

alexcrichton May 9, 2017

Choose a reason for hiding this comment

alexcrichton commented May 9, 2017

alexcrichton commented May 10, 2017

alexcrichton commented May 16, 2017

bors commented May 16, 2017

hjr3 commented May 16, 2017

bors commented May 16, 2017

alexcrichton commented May 16, 2017

bors commented May 16, 2017

Astlaan commented Feb 16, 2024

Rustin170506 commented Feb 17, 2024

Astlaan commented Feb 17, 2024 • edited Loading

weihanglo commented Feb 17, 2024

Astlaan commented Feb 17, 2024 •

edited

Loading