[New custom build] Implement platform-specific dependencies #735
Conversation
| @@ -23,7 +23,8 @@ pub enum ResolveMethod<'a> { | |||
| ResolveEverything, | |||
| ResolveRequired(/* dev_deps = */ bool, | |||
| /* features = */ &'a [String], | |||
| /* uses_default_features = */ bool), | |||
| /* uses_default_features = */ bool, | |||
| /* target_platform = */ Option<String>), | |||
There was a problem hiding this comment.
This is actually called pretty frequently due to the recursive nature of resolve, and I think this could get away with the more cheap Option<&'a str>, would that be possible?
tomaka
force-pushed
the
platform-specific-deps
branch
from
de65c36
to
b79c99f
Compare
|
Updated |
tomaka
force-pushed
the
platform-specific-deps
branch
from
b79c99f
to
b194050
Compare
|
Oops, I forgot to remove the call to |
tomaka
force-pushed
the
platform-specific-deps
branch
from
b194050
to
075832e
Compare
|
Updated |
| let platform = match method { | ||
| ResolveRequired(_, _, _, ref platform) => { | ||
| platform.clone() | ||
| }, |
There was a problem hiding this comment.
It's probably ok to omit the ref + clone() here (as well as below)
|
Looks fantastic, thanks @tomaka! I'll hold off on this pending the resolution of rust-lang/rfcs#403. |
tomaka
force-pushed
the
platform-specific-deps
branch
2 times, most recently
from
77ebc37
to
a3c5b06
Compare
tomaka
changed the title
tomaka
force-pushed
the
platform-specific-deps
branch
from
a3c5b06
to
1549b5c
Compare
|
BTW: I added a location in which we'll need to upload this information to the registry, you'll just need to fill it out: https://github.com/rust-lang/cargo/blob/master/src/cargo/ops/registry.rs#L75 |
tomaka
force-pushed
the
platform-specific-deps
branch
from
1549b5c
to
58cc1e0
Compare
tomaka
force-pushed
the
platform-specific-deps
branch
from
58cc1e0
to
f16291d
Compare
Done |
|
Ah I knew I forgot one other location! https://github.com/rust-lang/cargo/blob/master/src/cargo/sources/registry.rs#L420 (I can fix this up after merging as well, which can hopefully happen today!) |
|
I fixed it too |
|
Thanks @tomaka! |
|
RFC was approved this afternoon, let's see what bors thinks of this! |
cc #610