itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #5603 - matklad:publish-nightly-features, r=matklad

Browse Source 
Allow publishing crates with nightly features

closes #5427.

cc @rust-lang/cargo: I remember a vigorous debate over publishing crates with nightly Cargo features, but I can't recollect our exact plan of action. The discussion is logged here: https://paper.dropbox.com/doc/Unstable-Cargo-features-JBYMdsUYcO3FyW8Ubkjoz.

I think we just need to allow to publish crates with unstable cargo features, for the same reason we allow unstable rust features: you need explicit opt-in, even for deps. This is covered by Cargo tests: 9f097787b0/tests/testsuite/cargo_features.rs (L115-L215).

I am not sure if we have ever implemented crates.io side of validation?
This commit is contained in:
bors 2018-06-07 07:02:02 +00:00
commit e2348c2db2
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cargo/ops/registry.rs
View File

@ -43,12 +43,6 @@ pub struct PublishOpts<'cfg> {
pub fn publish(ws: &Workspace, opts: &PublishOpts) -> CargoResult<()> {
let pkg = ws.current()?;
// Allow publishing if a registry has been provided, or if there are no nightly
// features enabled.
if opts.registry.is_none() && !pkg.manifest().features().activated().is_empty() {
bail!("cannot publish crates which activate nightly-only cargo features to crates.io")
}
if let Some(ref allowed_registries) = *pkg.publish() {
if !match opts.registry {
Some(ref registry) => allowed_registries.contains(registry),

15
tests/testsuite/cargo_features.rs
View File

@ -1,5 +1,5 @@
use cargotest::ChannelChanger;
use cargotest::support::{execs, project};
use cargotest::support::{execs, project, publish};
use hamcrest::assert_that;
#[test]
@ -303,7 +303,9 @@ fn z_flags_rejected() {
}
#[test]
fn publish_rejected() {
fn publish_allowed() {
publish::setup();
let p = project("foo")
.file(
"Cargo.toml",
@ -319,9 +321,10 @@ fn publish_rejected() {
.file("src/lib.rs", "")
.build();
assert_that(
p.cargo("publish").masquerade_as_nightly_cargo(),
execs().with_status(101).with_stderr(
"error: cannot publish crates which activate nightly-only cargo features to crates.io",
),
p.cargo("publish")
.arg("--index")
.arg(publish::registry().to_string())
.masquerade_as_nightly_cargo(),
execs().with_status(0),
);
}