Apply workspace.exclude to workspace.default-members. #8485

thomcc · 2020-07-14T21:01:38Z

Not sure how controversial the feature request was, it seemed easy to do, so I did it (I'm aware it's possible this won't be accepted).

Fixes #8460

rust-highfive · 2020-07-14T21:01:42Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (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.

thomcc · 2020-07-14T21:12:10Z

This actually doesn't go all the way to fixing my issue, which I believe would also require fixing #6745. It's not clear to me which part of this code is causing that, but if someone has a concrete idea I could take a stab at that too. (possibly after this PR is figured out one way or another, though)

alexcrichton

Thanks for the PR! Also thanks for the descriptive issue, this seems like a reasonable feature to add to me.

If this doesn't end up actually solving your issue though that's sort of unfortunate :(. I think fixing that though sounds reasonable to add here too!

alexcrichton · 2020-07-16T16:08:55Z

src/cargo/core/workspace.rs

+                    // manifest path, both because `members_paths` doesn't
+                    // include `/Cargo.toml`, and because excluded paths may not
+                    // be crates.
+                    let exclude = members_paths.contains(&normalized_path)


How come this condition is here as well? I may not be fully remembering what the members_paths set is either...

members_paths is the glob-expanded paths of members (without Cargo.tomls). Without this check I believe the test (Which this patch adds) excluded_default_members_still_must_be_members failed -- e.g. you could have members = ["foo"], default-members = ["foo", "bar"] and exclude = ["bar"].

tests/testsuite/workspaces.rs

ehuss · 2020-07-18T03:43:31Z

If you want to work on #6745, I think the issue is the use of starts_with on this line. I'm uncertain why it is using starts_with, but I think it should be something more like manifest_path.parent().unwrap() == self.root_dir.join(mem).

I personally have a hard time following the workspace member discovery code, so it's a bit tricky to know for sure what to change, but that part definitely doesn't look right to me.

… (review feedback)

thomcc · 2020-07-20T16:40:18Z

If this doesn't end up actually solving your issue though that's sort of unfortunate :(. I think fixing that though sounds reasonable to add here too!

If possible, I think I'd rather try and fix #6745 as a separate issue -- This doesn't entirely fix my issue but it does make things slightly better, and it might be a week or two before I have a chance to dig into the other issue (it's also not as immediately obvious to me as this one was -- as mentioned, this code is a little confusing).

ehuss

Seems alright to me. Will merge once Cargo's CI is functioning again (hopefully soon).

ehuss · 2020-07-23T01:40:41Z

@bors r+

bors · 2020-07-23T01:40:43Z

📌 Commit b377c4b has been approved by ehuss

bors · 2020-07-23T01:40:51Z

⌛ Testing commit b377c4b with merge a8e3a53162fb7b8e8bf2ab94c03cebbf677bbdeb...

bors · 2020-07-23T01:55:20Z

💔 Test failed - checks-actions

ehuss · 2020-07-23T03:27:22Z

@bors retry

bors · 2020-07-23T03:27:29Z

⌛ Testing commit b377c4b with merge 632b1bb...

bors · 2020-07-23T03:58:05Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 632b1bb to master...

Update cargo 21 commits in 43cf77395cad5b79887b20b7cf19d418bbd703a9..aa6872140ab0fa10f641ab0b981d5330d419e927 2020-07-13 17:35:42 +0000 to 2020-07-23 13:46:27 +0000 - Update features set in CI. (rust-lang/cargo#8530) - Stabilize -Z crate-versions (rust-lang/cargo#8509) - Fix typo in docs (rust-lang/cargo#8529) - Remove unused CompileMode::all_modes (rust-lang/cargo#8526) - Mask out system core.autocrlf settings before resetting git repos (rust-lang/cargo#8523) - Flag git zlib errors as spurious errors (rust-lang/cargo#8520) - Fix the help display for the target-triple option (rust-lang/cargo#8515) - Check workspace member existence as dir. (rust-lang/cargo#8511) - Bump to 0.48.0, update changelog (rust-lang/cargo#8508) - Apply workspace.exclude to workspace.default-members. (rust-lang/cargo#8485) - Fix nightly tests for intra-doc links. (rust-lang/cargo#8528) - doc: Replace "regenerate" with "revoke" for API tokens (rust-lang/cargo#8510) - Add back Manifest::targets_mut (rust-lang/cargo#8494) - Build host dependencies with opt-level 0 by default (rust-lang/cargo#8500) - Fix freshness checks for build scripts on renamed dirs (rust-lang/cargo#8497) - Add a `-Zbuild-std-features` flag (rust-lang/cargo#8490) - clippy cleanups (rust-lang/cargo#8495) - Fix self-publish script. (rust-lang/cargo#8492) - Ensure `unstable.build-std` works like `-Zbuild-std` (rust-lang/cargo#8491) - Make `cargo metadata` output deterministic (rust-lang/cargo#8489) - Switch to github actions (rust-lang/cargo#8467)

Pkgsrc changes: * Remove patches now integrated upstream, many related to SunOS / Illumos. * The LLVM fix for powerpc is also now integrated upstream. * Adapt those patches where the source has moved or parts are integrated. * The randomness patches no longer applies, and I could not find where those files went... * Provide a separate bootstrap for NetBSD/powerpc 9.0, since apparently the C++ ABI is different from 8.0. Yes, this appears to be specific to the NetBSD powerpc ports. Upstream changes: Version 1.47.0 (2020-10-08) ========================== Language -------- - [Closures will now warn when not used.][74869] Compiler -------- - [Stabilized the `-C control-flow-guard` codegen option][73893], which enables [Control Flow Guard][1.47.0-cfg] for Windows platforms, and is ignored on other platforms. - [Upgraded to LLVM 11.][73526] - [Added tier 3\* support for the `thumbv4t-none-eabi` target.][74419] - [Upgrade the FreeBSD toolchain to version 11.4][75204] - [`RUST_BACKTRACE`'s output is now more compact.][75048] \* Refer to Rust's [platform support page][forge-platform-support] for more information on Rust's tiered platform support. Libraries --------- - [`CStr` now implements `Index<RangeFrom<usize>>`.][74021] - [Traits in `std`/`core` are now implemented for arrays of any length, not just those of length less than 33.][74060] - [`ops::RangeFull` and `ops::Range` now implement Default.][73197] - [`panic::Location` now implements `Copy`, `Clone`, `Eq`, `Hash`, `Ord`, `PartialEq`, and `PartialOrd`.][73583] Stabilized APIs --------------- - [`Ident::new_raw`] - [`Range::is_empty`] - [`RangeInclusive::is_empty`] - [`Result::as_deref`] - [`Result::as_deref_mut`] - [`Vec::leak`] - [`pointer::offset_from`] - [`f32::TAU`] - [`f64::TAU`] The following previously stable APIs have now been made const. - [The `new` method for all `NonZero` integers.][73858] - [The `checked_add`,`checked_sub`,`checked_mul`,`checked_neg`, `checked_shl`, `checked_shr`, `saturating_add`, `saturating_sub`, and `saturating_mul` methods for all integers.][73858] - [The `checked_abs`, `saturating_abs`, `saturating_neg`, and `signum` for all signed integers.][73858] - [The `is_ascii_alphabetic`, `is_ascii_uppercase`, `is_ascii_lowercase`, `is_ascii_alphanumeric`, `is_ascii_digit`, `is_ascii_hexdigit`, `is_ascii_punctuation`, `is_ascii_graphic`, `is_ascii_whitespace`, and `is_ascii_control` methods for `char` and `u8`.][73858] Cargo ----- - [`build-dependencies` are now built with opt-level 0 by default.][cargo/8500] You can override this by setting the following in your `Cargo.toml`. ```toml [profile.release.build-override] opt-level = 3 ``` - [`cargo-help` will now display man pages for commands rather just the `--help` text.][cargo/8456] - [`cargo-metadata` now emits a `test` field indicating if a target has tests enabled.][cargo/8478] - [`workspace.default-members` now respects `workspace.exclude`.][cargo/8485] - [`cargo-publish` will now use an alternative registry by default if it's the only registry specified in `package.publish`.][cargo/8571] Misc ---- - [Added a help button beside Rustdoc's searchbar that explains rustdoc's type based search.][75366] - [Added the Ayu theme to rustdoc.][71237] Compatibility Notes ------------------- - [Bumped the minimum supported Emscripten version to 1.39.20.][75716] - [Fixed a regression parsing `{} && false` in tail expressions.][74650] - [Added changes to how proc-macros are expanded in `macro_rules!` that should help to preserve more span information.][73084] These changes may cause compiliation errors if your macro was unhygenic or didn't correctly handle `Delimiter::None`. - [Moved support for the CloudABI target to tier 3.][75568] - [`linux-gnu` targets now require minimum kernel 2.6.32 and glibc 2.11.][74163] Internal Only -------- - [Improved default settings for bootstrapping in `x.py`.][73964] You can read details about this change in the ["Changes to `x.py` defaults"](https://blog.rust-lang.org/inside-rust/2020/08/30/changes-to-x-py-defaults.html) post on the Inside Rust blog. - [Added the `rustc-docs` component.][75560] This allows you to install and read the documentation for the compiler internal APIs. (Currently only available for `x86_64-unknown-linux-gnu`.) [1.47.0-cfg]: https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard [76980]: rust-lang/rust#76980 [75048]: rust-lang/rust#75048 [74163]: rust-lang/rust#74163 [71237]: rust-lang/rust#71237 [74869]: rust-lang/rust#74869 [73858]: rust-lang/rust#73858 [75716]: rust-lang/rust#75716 [75908]: rust-lang/rust#75908 [75516]: rust-lang/rust#75516 [75560]: rust-lang/rust#75560 [75568]: rust-lang/rust#75568 [75366]: rust-lang/rust#75366 [75204]: rust-lang/rust#75204 [74650]: rust-lang/rust#74650 [74419]: rust-lang/rust#74419 [73964]: rust-lang/rust#73964 [74021]: rust-lang/rust#74021 [74060]: rust-lang/rust#74060 [73893]: rust-lang/rust#73893 [73526]: rust-lang/rust#73526 [73583]: rust-lang/rust#73583 [73084]: rust-lang/rust#73084 [73197]: rust-lang/rust#73197 [72488]: rust-lang/rust#72488 [cargo/8456]: rust-lang/cargo#8456 [cargo/8478]: rust-lang/cargo#8478 [cargo/8485]: rust-lang/cargo#8485 [cargo/8500]: rust-lang/cargo#8500 [cargo/8571]: rust-lang/cargo#8571 [`Ident::new_raw`]: https://doc.rust-lang.org/nightly/proc_macro/struct.Ident.html#method.new_raw [`Range::is_empty`]: https://doc.rust-lang.org/nightly/std/ops/struct.Range.html#method.is_empty [`RangeInclusive::is_empty`]: https://doc.rust-lang.org/nightly/std/ops/struct.RangeInclusive.html#method.is_empty [`Result::as_deref_mut`]: https://doc.rust-lang.org/nightly/std/result/enum.Result.html#method.as_deref_mut [`Result::as_deref`]: https://doc.rust-lang.org/nightly/std/result/enum.Result.html#method.as_deref [`TypeId::of`]: https://doc.rust-lang.org/nightly/std/any/struct.TypeId.html#method.of [`Vec::leak`]: https://doc.rust-lang.org/nightly/std/vec/struct.Vec.html#method.leak [`f32::TAU`]: https://doc.rust-lang.org/nightly/std/f32/consts/constant.TAU.html [`f64::TAU`]: https://doc.rust-lang.org/nightly/std/f64/consts/constant.TAU.html [`pointer::offset_from`]: https://doc.rust-lang.org/nightly/std/primitive.pointer.html#method.offset_from

Apply workspace.exclude to workspace.default-members.

b70a596

rust-highfive assigned ehuss Jul 14, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2020

alexcrichton reviewed Jul 16, 2020

View reviewed changes

ehuss reviewed Jul 17, 2020

View reviewed changes

tests/testsuite/workspaces.rs Show resolved Hide resolved

Check for quux binary in excluded_default_members_crate_glob test…

b377c4b

… (review feedback)

ehuss approved these changes Jul 21, 2020

View reviewed changes

ehuss removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 21, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 23, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 23, 2020

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 23, 2020

This was referenced Jul 23, 2020

Stabilize -Z crate-versions #8509

Merged

Fix the help display for the target-triple option #8515

Merged

Mask out system core.autocrlf settings before resetting git repos #8523

Merged

bors merged commit 632b1bb into rust-lang:master Jul 23, 2020

ehuss mentioned this pull request Jul 23, 2020

Update cargo rust-lang/rust#74685

Merged

ehuss added this to the 1.47.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Apply workspace.exclude to workspace.default-members. #8485

Apply workspace.exclude to workspace.default-members. #8485

thomcc commented Jul 14, 2020

rust-highfive commented Jul 14, 2020

thomcc commented Jul 14, 2020 •

edited

Loading

alexcrichton left a comment

alexcrichton Jul 16, 2020

thomcc Jul 20, 2020

ehuss commented Jul 18, 2020

thomcc commented Jul 20, 2020

ehuss left a comment

ehuss commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

ehuss commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

Apply workspace.exclude to workspace.default-members. #8485

Apply workspace.exclude to workspace.default-members. #8485

Conversation

thomcc commented Jul 14, 2020

rust-highfive commented Jul 14, 2020

thomcc commented Jul 14, 2020 • edited Loading

alexcrichton left a comment

Choose a reason for hiding this comment

alexcrichton Jul 16, 2020

Choose a reason for hiding this comment

thomcc Jul 20, 2020

Choose a reason for hiding this comment

ehuss commented Jul 18, 2020

thomcc commented Jul 20, 2020

ehuss left a comment

Choose a reason for hiding this comment

ehuss commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

ehuss commented Jul 23, 2020

bors commented Jul 23, 2020

bors commented Jul 23, 2020

thomcc commented Jul 14, 2020 •

edited

Loading