Make required dependency as future an error, remove RcList #6860

Eh2406 · 2019-04-17T21:55:10Z

This makes it an error to set a feature on a dependency if it is the name of a required dependency not a feature. This has been a warning for a long time. The resolver will backtrack to find a version that works, if one is available. So I think it is safe to make the change.

If you need to make a optional dependency into a required dependency without a semver breaking change this can be done with rename dependencies.

The result is that we can remove 3 data structures that get cloned once per tick of the resolver.

rust-highfive · 2019-04-17T21:55:21Z

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton

Looks reasonable to me! I'm a little worried in a few places about reconstructing resolver state which may accidentally produce subtle differences with overriding, so I think it may be worthwhile to add a few more asserts here and there to ensure everything is as we expect and we're not accidentally overriding something.

src/cargo/core/resolver/context.rs

src/cargo/core/resolver/types.rs

src/cargo/core/resolver/context.rs

src/cargo/core/resolver/mod.rs

alexcrichton · 2019-04-19T16:01:29Z

src/cargo/core/resolver/mod.rs

+                    uses_default_features: dep.uses_default_features(),
+                };
+                for (dep, features) in new_cx
+                    .resolve_features(None, &summery, &method, config)


Would it be possible to perhaps avoid re-calling resolve_features here? I found this somewhat complicated to follow, and figured it might be simpler if we simply walk over the graph after resolution, check the list of activated features for each package, and then present a warning if the feature enables a required dependency.

We may produce a slightly worse error message since we don't have why a feature is activated, but that seems reasonable given the age of this warning perhaps?

The original commit f0f8565, did that. It was a lot cleaner. But it did not work. resolve_features is only adds a canonicalized feature to cx.resolve_features. So I did not find a way to reconstruct the warnings from that. (The hard cases are "invalid9", "dep_feature_in_cmd_line") Suggestions are welcome.

I also don't think we can extend that strategy to only the features transitively enabled by some deps. But I would love to be proven wrong.

I wonder if we could build up a side table or something like that during resolution to facilitate this strategy of emitting warnings? I suppose that's sort of like what happens today, but I think it'd be best to decouple the warning emission as much as we can from the exact state of the resolver today, because it may make future changes to resolve_features more complicated in the future

True, this new code that redos the work of the resolver is going to be a pane to keep in sink.

I gave up on making it work, and the future opportunities of filtering dependencies, and just made this case a resolver bactrackable error.

alexcrichton · 2019-04-22T16:09:16Z

src/cargo/core/resolver/context.rs

        self.activations
            .values()
            .for_each(|(r, _)| graph.add(r.package_id()));
        for i in self.parents.iter() {
            graph.add(*i);
            for (o, e) in self.parents.edges(i) {
-                *graph.link(*o, *i) = e.to_vec();
+                let old_link = graph.link(*o, *i);
+                debug_assert!(old_link.is_empty());


Oh FWIW I'd be fine with just a plain assert!, I think we should only use debug_assert if there's a runtime issue

alexcrichton · 2019-04-23T22:48:43Z

@bors: r+

That also works I think :)

bors · 2019-04-23T22:48:44Z

📌 Commit 35ff555 has been approved by alexcrichton

bors · 2019-04-23T22:48:51Z

⌛ Testing commit 35ff555 with merge 66817c5f6a11c9b4358d9384377b86512ebde00d...

bors · 2019-04-23T23:17:28Z

💔 Test failed - checks-travis

Eh2406 · 2019-04-24T14:44:00Z

I missed that this had not merged, sorry.

alexcrichton · 2019-04-25T15:26:15Z

@bors: r+

bors · 2019-04-25T15:26:18Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

bors · 2019-04-25T15:26:19Z

📌 Commit 35ff555 has been approved by alexcrichton

bors · 2019-04-25T15:26:27Z

⌛ Testing commit 35ff555 with merge a507ae4...

Make required dependency as future an error, remove RcList This makes it an error to set a feature on a dependency if it is the name of a required dependency not a feature. This has been a warning for a long time. The resolver will backtrack to find a version that works, if one is available. So I think it is safe to make the change. If you need to make a optional dependency into a required dependency without a semver breaking change this can be done with rename dependencies. The result is that we can remove 3 data structures that get cloned once per tick of the resolver.

bors · 2019-04-25T15:52:01Z

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

Remove Candidate `Candidate` was a type to record the possibility that a package was replaced using the replacements feature. However there were only two places that cared about this possibility. One was switched to used a lookup table in #6860. This PR switches the other to use that table as well. Making the entire `Candidate` type unnecessary. The main benefit of this change is a reduction in the cognitive complexity.

Pkgsrc changes: * NetBSD/sparc64 disabling of "packed" removed ("packed" removed upstream) * Adapt src_libstd_build.rs patch, update sed'ing of .cargo-checksum.json Build verified on NetBSD 8.0/amd64. Upstream changes: Version 1.36.0 (2019-07-04) ========================== Language -------- - [Non-Lexical Lifetimes are now enabled on the 2015 edition.][59114] - [The order of traits in trait objects no longer affects the semantics of that object.][59445] e.g. `dyn Send + fmt::Debug` is now equivalent to `dyn fmt::Debug + Send`, where this was previously not the case. Libraries --------- - [`HashMap`'s implementation has been replaced with `hashbrown::HashMap` implem entation.][58623] - [`TryFromSliceError` now implements `From<Infallible>`.][60318] - [`mem::needs_drop` is now available as a const fn.][60364] - [`alloc::Layout::from_size_align_unchecked` is now available as a const fn.][6 0370] - [`String` now implements `BorrowMut<str>`.][60404] - [`io::Cursor` now implements `Default`.][60234] - [Both `NonNull::{dangling, cast}` are now const fns.][60244] - [The `alloc` crate is now stable.][59675] `alloc` allows you to use a subset of `std` (e.g. `Vec`, `Box`, `Arc`) in `#![no_std]` environments if the environment has access to heap memory allocation. - [`String` now implements `From<&String>`.][59825] - [You can now pass multiple arguments to the `dbg!` macro.][59826] `dbg!` will return a tuple of each argument when there is multiple arguments. - [`Result::{is_err, is_ok}` are now `#[must_use]` and will produce a warning if not used.][59648] Stabilized APIs --------------- - [`VecDeque::rotate_left`] - [`VecDeque::rotate_right`] - [`Iterator::copied`] - [`io::IoSlice`] - [`io::IoSliceMut`] - [`Read::read_vectored`] - [`Write::write_vectored`] - [`str::as_mut_ptr`] - [`mem::MaybeUninit`] - [`pointer::align_offset`] - [`future::Future`] - [`task::Context`] - [`task::RawWaker`] - [`task::RawWakerVTable`] - [`task::Waker`] - [`task::Poll`] Cargo ----- - [Cargo will now produce an error if you attempt to use the name of a required dependency as a feature.][cargo/6860] - [You can now pass the `--offline` flag to run cargo without accessing the netw ork.][cargo/6934] You can find further change's in [Cargo's 1.36.0 release notes][cargo-1-36-0]. Clippy ------ There have been numerous additions and fixes to clippy, see [Clippy's 1.36.0 rel ease notes][clippy-1-36-0] for more details. Misc ---- Compatibility Notes ------------------- - [`std::arch::x86::_rdtsc` returns `u64` instead of `i64`][stdsimd/559] - [`std::arch::x86_64::_mm_shuffle_ps` takes an `i32` instead of `u32` for `mask `][stdsimd/522] - With the stabilisation of `mem::MaybeUninit`, `mem::uninitialized` use is no longer recommended, and will be deprecated in 1.38.0. [60318]: rust-lang/rust#60318 [60364]: rust-lang/rust#60364 [60370]: rust-lang/rust#60370 [60404]: rust-lang/rust#60404 [60234]: rust-lang/rust#60234 [60244]: rust-lang/rust#60244 [58623]: rust-lang/rust#58623 [59648]: rust-lang/rust#59648 [59675]: rust-lang/rust#59675 [59825]: rust-lang/rust#59825 [59826]: rust-lang/rust#59826 [59445]: rust-lang/rust#59445 [59114]: rust-lang/rust#59114 [cargo/6860]: rust-lang/cargo#6860 [cargo/6934]: rust-lang/cargo#6934 [`VecDeque::rotate_left`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.rotate_left [`VecDeque::rotate_right`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.rotate_right [`Iterator::copied`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.copied [`io::IoSlice`]: https://doc.rust-lang.org/std/io/struct.IoSlice.html [`io::IoSliceMut`]: https://doc.rust-lang.org/std/io/struct.IoSliceMut.html [`Read::read_vectored`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_vectored [`Write::write_vectored`]: https://doc.rust-lang.org/std/io/trait.Write.html#method.write_vectored [`str::as_mut_ptr`]: https://doc.rust-lang.org/std/primitive.str.html#method.as_mut_ptr [`mem::MaybeUninit`]: https://doc.rust-lang.org/std/mem/union.MaybeUninit.html [`pointer::align_offset`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.align_offset [`future::Future`]: https://doc.rust-lang.org/std/future/trait.Future.html [`task::Context`]: https://doc.rust-lang.org/beta/std/task/struct.Context.html [`task::RawWaker`]: https://doc.rust-lang.org/beta/std/task/struct.RawWaker.html [`task::RawWakerVTable`]: https://doc.rust-lang.org/beta/std/task/struct.RawWakerVTable.html [`task::Waker`]: https://doc.rust-lang.org/beta/std/task/struct.Waker.html [`task::Poll`]: https://doc.rust-lang.org/beta/std/task/enum.Poll.html [clippy-1-36-0]: https://github.com/rust-lang/rust-clippy/blob/master/CHANGELOG.md#rust-136 [cargo-1-36-0]: https://github.com/rust-lang/cargo/blob/master/CHANGELOG.md#cargo-136-2019-07-04 [stdsimd/522]: rust-lang/stdarch#522 [stdsimd/559]: rust-lang/stdarch#559

rust-highfive assigned alexcrichton Apr 17, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2019

Eh2406 added 6 commits April 18, 2019 15:05

remove the resolver warnings

f0f8565

calculate features the hard way

4590e74

move to a function

0131d09

list used used_replacements after we figure out what is used

df62a57

invert parents to get graph

097dbdf

remove dead code

8cd9b0c

Eh2406 force-pushed the no-RcList branch from 3dff5ba to 8cd9b0c Compare April 18, 2019 19:08

alexcrichton reviewed Apr 19, 2019

View reviewed changes

address nits

d0c80ec

alexcrichton reviewed Apr 22, 2019

View reviewed changes

fix replacements

a473716

Eh2406 force-pushed the no-RcList branch from 8799362 to a473716 Compare April 22, 2019 19:49

just give up and make it an error

35ff555

Eh2406 changed the title ~~No RcList~~ Make required dependency as future an error, remove RcList Apr 22, 2019

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 Apr 23, 2019

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 Apr 23, 2019

Eh2406 added the relnotes Release-note worthy label Apr 24, 2019

Eh2406 closed this Apr 24, 2019

Eh2406 deleted the no-RcList branch April 24, 2019 14:40

Eh2406 restored the no-RcList branch April 24, 2019 14:42

Eh2406 reopened this Apr 24, 2019

Eh2406 mentioned this pull request Apr 24, 2019

Caching the dependencies #6853

Merged

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 Apr 25, 2019

bors merged commit 35ff555 into rust-lang:master Apr 25, 2019

bors mentioned this pull request Apr 25, 2019

Implement the 'frontend' of public-private dependencies #6772

Merged

Eh2406 deleted the no-RcList branch April 25, 2019 16:32

Eh2406 mentioned this pull request May 15, 2019

Remove Candidate #6946

Merged

tangmi mentioned this pull request Nov 2, 2019

stdweb feature no longer builds? sebcrozet/instant#8

Closed

Eh2406 mentioned this pull request Sep 16, 2021

Drop the im-rc dependency #9878

Closed

ehuss added this to the 1.36.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make required dependency as future an error, remove RcList #6860

Make required dependency as future an error, remove RcList #6860

Eh2406 commented Apr 17, 2019 •

edited

Loading

rust-highfive commented Apr 17, 2019

alexcrichton left a comment

alexcrichton Apr 19, 2019

Eh2406 Apr 19, 2019

alexcrichton Apr 22, 2019

Eh2406 Apr 22, 2019

alexcrichton Apr 22, 2019

alexcrichton commented Apr 23, 2019

bors commented Apr 23, 2019

bors commented Apr 23, 2019

bors commented Apr 23, 2019

Eh2406 commented Apr 24, 2019

alexcrichton commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

Make required dependency as future an error, remove RcList #6860

Make required dependency as future an error, remove RcList #6860

Conversation

Eh2406 commented Apr 17, 2019 • edited Loading

rust-highfive commented Apr 17, 2019

alexcrichton left a comment

Choose a reason for hiding this comment

alexcrichton Apr 19, 2019

Choose a reason for hiding this comment

Eh2406 Apr 19, 2019

Choose a reason for hiding this comment

alexcrichton Apr 22, 2019

Choose a reason for hiding this comment

Eh2406 Apr 22, 2019

Choose a reason for hiding this comment

alexcrichton Apr 22, 2019

Choose a reason for hiding this comment

alexcrichton commented Apr 23, 2019

bors commented Apr 23, 2019

bors commented Apr 23, 2019

bors commented Apr 23, 2019

Eh2406 commented Apr 24, 2019

alexcrichton commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

bors commented Apr 25, 2019

Eh2406 commented Apr 17, 2019 •

edited

Loading