From c829772421d16340089814235fac4c23ea6b1159 Mon Sep 17 00:00:00 2001 From: Lin Yihai Date: Thu, 18 Jan 2024 20:43:18 +0800 Subject: [PATCH] feat: Add "-Zpublic-dependency" for public-dependency feature --- src/cargo/core/compiler/mod.rs | 11 +- src/cargo/core/features.rs | 2 + src/cargo/core/workspace.rs | 1 - src/cargo/ops/cargo_package.rs | 9 +- src/cargo/util/toml/mod.rs | 140 ++++++++------ src/doc/src/reference/unstable.md | 4 +- tests/testsuite/cargo/z_help/stdout.log | 1 + .../in/primary/Cargo.toml | 1 - .../out/primary/Cargo.toml | 1 - .../cargo_add/no_public/in/Cargo.toml | 1 - .../cargo_add/no_public/out/Cargo.toml | 1 - .../overwrite_no_public/in/Cargo.toml | 1 - .../overwrite_no_public/out/Cargo.toml | 1 - .../in/Cargo.toml | 1 - .../out/Cargo.toml | 1 - .../cargo_add/overwrite_public/in/Cargo.toml | 1 - .../cargo_add/overwrite_public/mod.rs | 2 +- .../cargo_add/overwrite_public/out/Cargo.toml | 1 - .../in/Cargo.toml | 1 - .../out/Cargo.toml | 1 - .../testsuite/cargo_add/public/in/Cargo.toml | 1 - tests/testsuite/cargo_add/public/mod.rs | 2 +- .../testsuite/cargo_add/public/out/Cargo.toml | 1 - tests/testsuite/pub_priv.rs | 182 +++++++++--------- 24 files changed, 178 insertions(+), 190 deletions(-) diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index fedd23c61ddc..652c7bf0285c 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -89,7 +89,7 @@ use crate::core::compiler::future_incompat::FutureIncompatReport; pub use crate::core::compiler::unit::{Unit, UnitInterner}; use crate::core::manifest::TargetSourcePath; use crate::core::profiles::{PanicStrategy, Profile, StripInner}; -use crate::core::{Feature, PackageId, Target, Verbosity}; +use crate::core::{PackageId, Target, Verbosity}; use crate::util::errors::{CargoResult, VerboseError}; use crate::util::interning::InternedString; use crate::util::machine_message::{self, Message}; @@ -1437,14 +1437,7 @@ pub fn extern_args( |dep: &UnitDep, extern_crate_name: InternedString, noprelude: bool| -> CargoResult<()> { let mut value = OsString::new(); let mut opts = Vec::new(); - if unit - .pkg - .manifest() - .unstable_features() - .require(Feature::public_dependency()) - .is_ok() - && !dep.public - && unit.target.is_lib() + if !dep.public && unit.target.is_lib() && cx.bcx.config.cli_unstable().public_dependency { opts.push("priv"); *unstable_opts = true; diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index 2f52a24c0161..c02538d9a3bc 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -764,6 +764,7 @@ unstable_cli_options!( panic_abort_tests: bool = ("Enable support to run tests with -Cpanic=abort"), precise_pre_release: bool = ("Enable pre-release versions to be selected with `update --precise`"), profile_rustflags: bool = ("Enable the `rustflags` option in profiles in .cargo/config.toml file"), + public_dependency: bool = ("Enable public-dependency to allow marking dependencies as public/private"), publish_timeout: bool = ("Enable the `publish.timeout` key in .cargo/config.toml file"), rustdoc_map: bool = ("Allow passing external documentation mappings to rustdoc"), rustdoc_scrape_examples: bool = ("Allows Rustdoc to scrape code examples from reverse-dependencies"), @@ -1140,6 +1141,7 @@ impl CliUnstable { "mtime-on-use" => self.mtime_on_use = parse_empty(k, v)?, "no-index-update" => self.no_index_update = parse_empty(k, v)?, "panic-abort-tests" => self.panic_abort_tests = parse_empty(k, v)?, + "public-dependency" => self.public_dependency = parse_empty(k, v)?, "profile-rustflags" => self.profile_rustflags = parse_empty(k, v)?, "precise-pre-release" => self.precise_pre_release = parse_empty(k, v)?, "trim-paths" => self.trim_paths = parse_empty(k, v)?, diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index 6bb8188dc3aa..f880965ac181 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -449,7 +449,6 @@ impl<'cfg> Workspace<'cfg> { // NOTE: Since we use ConfigRelativePath, this root isn't used as // any relative paths are resolved before they'd be joined with root. Path::new("unused-relative-path"), - self.unstable_features(), /* kind */ None, ) }) diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index 2ff0187feed1..3f5d1e7b17ac 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -10,8 +10,8 @@ use crate::core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor} use crate::core::manifest::Target; use crate::core::resolver::CliFeatures; use crate::core::{registry::PackageRegistry, resolver::HasDevUnits}; -use crate::core::{Feature, Shell, Verbosity, Workspace}; use crate::core::{Package, PackageId, PackageSet, Resolve, SourceId}; +use crate::core::{Shell, Verbosity, Workspace}; use crate::sources::PathSource; use crate::util::cache_lock::CacheLockMode; use crate::util::config::JobsConfig; @@ -911,12 +911,7 @@ fn run_verify( let pkg_fingerprint = hash_all(&dst)?; let ws = Workspace::ephemeral(new_pkg, config, None, true)?; - let rustc_args = if pkg - .manifest() - .unstable_features() - .require(Feature::public_dependency()) - .is_ok() - { + let rustc_args = if ws.config().cli_unstable().public_dependency { // FIXME: Turn this on at some point in the future //Some(vec!["-D exported_private_dependencies".to_string()]) Some(vec![]) diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index 0ffeda2ada80..ccb972a24128 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -9,8 +9,8 @@ use crate::AlreadyPrintedError; use anyhow::{anyhow, bail, Context as _}; use cargo_platform::Platform; use cargo_util::paths; -use cargo_util_schemas::manifest; -use cargo_util_schemas::manifest::RustVersion; +use cargo_util_schemas::manifest::{self, InheritableDependency}; +use cargo_util_schemas::manifest::{RustVersion, TomlDependency}; use itertools::Itertools; use lazycell::LazyCell; use pathdiff::diff_paths; @@ -105,61 +105,62 @@ fn read_manifest_from_str( let mut unused = BTreeSet::new(); let deserializer = toml::de::Deserializer::new(contents); - let manifest: manifest::TomlManifest = match serde_ignored::deserialize(deserializer, |path| { - let mut key = String::new(); - stringify(&mut key, &path); - unused.insert(key); - }) { - Ok(manifest) => manifest, - Err(e) => { - let Some(span) = e.span() else { - return Err(e.into()); - }; + let mut manifest: manifest::TomlManifest = + match serde_ignored::deserialize(deserializer, |path| { + let mut key = String::new(); + stringify(&mut key, &path); + unused.insert(key); + }) { + Ok(manifest) => manifest, + Err(e) => { + let Some(span) = e.span() else { + return Err(e.into()); + }; - let (line_num, column) = translate_position(&contents, span.start); - let source_start = contents[0..span.start] - .rfind('\n') - .map(|s| s + 1) - .unwrap_or(0); - let source_end = contents[span.end - 1..] - .find('\n') - .map(|s| s + span.end) - .unwrap_or(contents.len()); - let source = &contents[source_start..source_end]; - // Make sure we don't try to highlight past the end of the line, - // but also make sure we are highlighting at least one character - let highlight_end = (column + contents[span].chars().count()) - .min(source.len()) - .max(column + 1); - // Get the path to the manifest, relative to the cwd - let manifest_path = diff_paths(manifest_file, config.cwd()) - .unwrap_or_else(|| manifest_file.to_path_buf()) - .display() - .to_string(); - let snippet = Snippet { - title: Some(Annotation { - id: None, - label: Some(e.message()), - annotation_type: AnnotationType::Error, - }), - footer: vec![], - slices: vec![Slice { - source: &source, - line_start: line_num + 1, - origin: Some(manifest_path.as_str()), - annotations: vec![SourceAnnotation { - range: (column, highlight_end), - label: "", + let (line_num, column) = translate_position(&contents, span.start); + let source_start = contents[0..span.start] + .rfind('\n') + .map(|s| s + 1) + .unwrap_or(0); + let source_end = contents[span.end - 1..] + .find('\n') + .map(|s| s + span.end) + .unwrap_or(contents.len()); + let source = &contents[source_start..source_end]; + // Make sure we don't try to highlight past the end of the line, + // but also make sure we are highlighting at least one character + let highlight_end = (column + contents[span].chars().count()) + .min(source.len()) + .max(column + 1); + // Get the path to the manifest, relative to the cwd + let manifest_path = diff_paths(manifest_file, config.cwd()) + .unwrap_or_else(|| manifest_file.to_path_buf()) + .display() + .to_string(); + let snippet = Snippet { + title: Some(Annotation { + id: None, + label: Some(e.message()), annotation_type: AnnotationType::Error, + }), + footer: vec![], + slices: vec![Slice { + source: &source, + line_start: line_num + 1, + origin: Some(manifest_path.as_str()), + annotations: vec![SourceAnnotation { + range: (column, highlight_end), + label: "", + annotation_type: AnnotationType::Error, + }], + fold: false, }], - fold: false, - }], - }; - let renderer = Renderer::styled(); - writeln!(config.shell().err(), "{}", renderer.render(snippet))?; - return Err(AlreadyPrintedError::new(e.into()).into()); - } - }; + }; + let renderer = Renderer::styled(); + writeln!(config.shell().err(), "{}", renderer.render(snippet))?; + return Err(AlreadyPrintedError::new(e.into()).into()); + } + }; let add_unused = |warnings: &mut Warnings| { for key in unused { warnings.add_warning(format!("unused manifest key: {}", key)); @@ -183,10 +184,33 @@ fn read_manifest_from_str( } } } + + let mut public_deps_without_z = BTreeSet::new(); + if let Some(deps) = &mut manifest.dependencies { + for (name, dep) in deps { + if let InheritableDependency::Value(toml_dep) = dep { + if toml_dep.is_public() && !config.cli_unstable().public_dependency { + if let TomlDependency::Detailed(d) = toml_dep { + d.public = Some(false) + } + public_deps_without_z.insert(name.clone()); + } + } + } + } + let public_warn = |warnings: &mut Warnings| { + for name in public_deps_without_z { + warnings.add_warning(format!( + "{name} is public, pass `-Zpublic-dependency` to enable support for it", + )) + } + }; + return if manifest.project.is_some() || manifest.package.is_some() { let (mut manifest, paths) = to_real_manifest(manifest, embedded, source_id, package_root, config)?; add_unused(manifest.warnings_mut()); + public_warn(manifest.warnings_mut()); if manifest.targets().iter().all(|t| t.is_custom_build()) { bail!( "no targets specified in the manifest\n\ @@ -198,6 +222,7 @@ fn read_manifest_from_str( } else { let (mut m, paths) = to_virtual_manifest(manifest, source_id, package_root, config)?; add_unused(m.warnings_mut()); + public_warn(m.warnings_mut()); Ok((EitherManifest::Virtual(m), paths)) }; @@ -678,7 +703,6 @@ pub fn to_real_manifest( nested_paths: &mut nested_paths, config, warnings: &mut warnings, - features: &features, platform: None, root: package_root, }; @@ -1153,7 +1177,6 @@ fn to_virtual_manifest( config, warnings: &mut warnings, platform: None, - features: &features, root, }; (replace(&me, &mut cx)?, patch(&me, &mut cx)?) @@ -1302,7 +1325,6 @@ struct Context<'a, 'b> { warnings: &'a mut Vec, platform: Option, root: &'a Path, - features: &'a Features, } fn verify_lints(lints: Option) -> CargoResult> { @@ -1709,7 +1731,6 @@ pub(crate) fn to_dependency( warnings: &mut Vec, platform: Option, root: &Path, - features: &Features, kind: Option, ) -> CargoResult { dep_to_dependency( @@ -1723,7 +1744,6 @@ pub(crate) fn to_dependency( warnings, platform, root, - features, }, kind, ) @@ -1944,8 +1964,6 @@ fn detailed_dep_to_dependency( } if let Some(p) = orig.public { - cx.features.require(Feature::public_dependency())?; - if dep.kind() != DepKind::Normal { bail!("'public' specifier can only be used on regular dependencies, not {:?} dependencies", dep.kind()); } diff --git a/src/doc/src/reference/unstable.md b/src/doc/src/reference/unstable.md index 164e51edf0eb..8514a7f4bb51 100644 --- a/src/doc/src/reference/unstable.md +++ b/src/doc/src/reference/unstable.md @@ -296,11 +296,9 @@ The 'public-dependency' feature allows marking dependencies as 'public' or 'private'. When this feature is enabled, additional information is passed to rustc to allow the 'exported_private_dependencies' lint to function properly. -This requires the appropriate key to be set in `cargo-features`: +Pass `-Zpublic-dependency` to cargo to enable support for it. ```toml -cargo-features = ["public-dependency"] - [dependencies] my_dep = { version = "1.2.3", public = true } private_dep = "2.0.0" # Will be 'private' by default diff --git a/tests/testsuite/cargo/z_help/stdout.log b/tests/testsuite/cargo/z_help/stdout.log index 2a4703cc11f2..43c200c46b1f 100644 --- a/tests/testsuite/cargo/z_help/stdout.log +++ b/tests/testsuite/cargo/z_help/stdout.log @@ -25,6 +25,7 @@ Available unstable (nightly-only) flags: -Z panic-abort-tests Enable support to run tests with -Cpanic=abort -Z precise-pre-release Enable pre-release versions to be selected with `update --precise` -Z profile-rustflags Enable the `rustflags` option in profiles in .cargo/config.toml file + -Z public-dependency Enable public-dependency to allow marking dependencies as public/private -Z publish-timeout Enable the `publish.timeout` key in .cargo/config.toml file -Z rustdoc-map Allow passing external documentation mappings to rustdoc -Z rustdoc-scrape-examples Allows Rustdoc to scrape code examples from reverse-dependencies diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/in/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_public/in/primary/Cargo.toml index b5923a106b93..b867edbbed18 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/in/primary/Cargo.toml +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/in/primary/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [package] name = "bar" version = "0.0.0" \ No newline at end of file diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_public/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_public/out/primary/Cargo.toml index 665c6ae5e02e..81d004e02fb3 100644 --- a/tests/testsuite/cargo_add/detect_workspace_inherit_public/out/primary/Cargo.toml +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_public/out/primary/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [package] name = "bar" version = "0.0.0" diff --git a/tests/testsuite/cargo_add/no_public/in/Cargo.toml b/tests/testsuite/cargo_add/no_public/in/Cargo.toml index e9087535be33..3ecdb6681676 100644 --- a/tests/testsuite/cargo_add/no_public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/no_public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/no_public/out/Cargo.toml b/tests/testsuite/cargo_add/no_public/out/Cargo.toml index b9f045116773..496ac8a6236c 100644 --- a/tests/testsuite/cargo_add/no_public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/no_public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_no_public/in/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_public/in/Cargo.toml index 43d0d8238a1b..fd02884a87d7 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_no_public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_no_public/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_public/out/Cargo.toml index b9f045116773..496ac8a6236c 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_no_public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/in/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_public_with_public/in/Cargo.toml index c6e61bdca3f7..fca7be6f93a3 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_no_public_with_public/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_no_public_with_public/out/Cargo.toml index 77fccaa6a57e..82f23b1b70ce 100644 --- a/tests/testsuite/cargo_add/overwrite_no_public_with_public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_no_public_with_public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_public/in/Cargo.toml b/tests/testsuite/cargo_add/overwrite_public/in/Cargo.toml index 43d0d8238a1b..fd02884a87d7 100644 --- a/tests/testsuite/cargo_add/overwrite_public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_public/mod.rs b/tests/testsuite/cargo_add/overwrite_public/mod.rs index bbf8d65a6e0c..d7b2bc640a26 100644 --- a/tests/testsuite/cargo_add/overwrite_public/mod.rs +++ b/tests/testsuite/cargo_add/overwrite_public/mod.rs @@ -14,7 +14,7 @@ fn case() { snapbox::cmd::Command::cargo_ui() .arg("add") - .arg_line("my-package --public") + .arg_line("my-package --public -Zpublic-dependency") .current_dir(cwd) .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() diff --git a/tests/testsuite/cargo_add/overwrite_public/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_public/out/Cargo.toml index 77fccaa6a57e..82f23b1b70ce 100644 --- a/tests/testsuite/cargo_add/overwrite_public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/in/Cargo.toml b/tests/testsuite/cargo_add/overwrite_public_with_no_public/in/Cargo.toml index cc7ec1a9b7e0..2fa30c957dec 100644 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/overwrite_public_with_no_public/out/Cargo.toml b/tests/testsuite/cargo_add/overwrite_public_with_no_public/out/Cargo.toml index cfa80cc1373b..79fda4582900 100644 --- a/tests/testsuite/cargo_add/overwrite_public_with_no_public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/overwrite_public_with_no_public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/public/in/Cargo.toml b/tests/testsuite/cargo_add/public/in/Cargo.toml index e9087535be33..3ecdb6681676 100644 --- a/tests/testsuite/cargo_add/public/in/Cargo.toml +++ b/tests/testsuite/cargo_add/public/in/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/cargo_add/public/mod.rs b/tests/testsuite/cargo_add/public/mod.rs index bbf8d65a6e0c..d7b2bc640a26 100644 --- a/tests/testsuite/cargo_add/public/mod.rs +++ b/tests/testsuite/cargo_add/public/mod.rs @@ -14,7 +14,7 @@ fn case() { snapbox::cmd::Command::cargo_ui() .arg("add") - .arg_line("my-package --public") + .arg_line("my-package --public -Zpublic-dependency") .current_dir(cwd) .masquerade_as_nightly_cargo(&["public-dependency"]) .assert() diff --git a/tests/testsuite/cargo_add/public/out/Cargo.toml b/tests/testsuite/cargo_add/public/out/Cargo.toml index 77fccaa6a57e..82f23b1b70ce 100644 --- a/tests/testsuite/cargo_add/public/out/Cargo.toml +++ b/tests/testsuite/cargo_add/public/out/Cargo.toml @@ -1,4 +1,3 @@ -cargo-features = ["public-dependency"] [workspace] [package] diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs index 4195f5863136..39807ab2d49d 100644 --- a/tests/testsuite/pub_priv.rs +++ b/tests/testsuite/pub_priv.rs @@ -13,8 +13,6 @@ fn exported_priv_warning() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -32,7 +30,7 @@ fn exported_priv_warning() { ) .build(); - p.cargo("check --message-format=short") + p.cargo("check -Zpublic-dependency --message-format=short") .masquerade_as_nightly_cargo(&["public-dependency"]) .with_stderr_contains( "\ @@ -52,8 +50,6 @@ fn exported_pub_dep() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -71,7 +67,7 @@ fn exported_pub_dep() { ) .build(); - p.cargo("check --message-format=short") + p.cargo("check -Zpublic-dependency --message-format=short") .masquerade_as_nightly_cargo(&["public-dependency"]) .with_stderr( "\ @@ -86,75 +82,6 @@ fn exported_pub_dep() { .run() } -#[cargo_test] -pub fn requires_nightly_cargo() { - let p = project() - .file( - "Cargo.toml", - r#" - cargo-features = ["public-dependency"] - "#, - ) - .file("src/lib.rs", "") - .build(); - - p.cargo("check --message-format=short") - .with_status(101) - .with_stderr( - "\ -error: failed to parse manifest at `[..]` - -Caused by: - the cargo feature `public-dependency` requires a nightly version of Cargo, but this is the `stable` channel - See https://doc.rust-lang.org/book/appendix-07-nightly-rust.html for more information about Rust release channels. - See https://doc.rust-lang.org/[..]cargo/reference/unstable.html#public-dependency for more information about using this feature. -" - ) - .run() -} - -#[cargo_test] -fn requires_feature() { - Package::new("pub_dep", "0.1.0") - .file("src/lib.rs", "") - .publish(); - - let p = project() - .file( - "Cargo.toml", - r#" - [package] - name = "foo" - version = "0.0.1" - - [dependencies] - pub_dep = { version = "0.1.0", public = true } - "#, - ) - .file("src/lib.rs", "") - .build(); - - p.cargo("check --message-format=short") - .masquerade_as_nightly_cargo(&["public-dependency"]) - .with_status(101) - .with_stderr( - "\ -error: failed to parse manifest at `[..]` - -Caused by: - feature `public-dependency` is required - - The package requires the Cargo feature called `public-dependency`, \ - but that feature is not stabilized in this version of Cargo (1.[..]). - Consider adding `cargo-features = [\"public-dependency\"]` to the top of Cargo.toml \ - (above the [package] table) to tell Cargo you are opting in to use this unstable feature. - See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#public-dependency \ - for more information about the status of this feature. -", - ) - .run() -} - #[cargo_test] fn pub_dev_dependency() { Package::new("pub_dep", "0.1.0") @@ -165,8 +92,6 @@ fn pub_dev_dependency() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -184,7 +109,7 @@ fn pub_dev_dependency() { ) .build(); - p.cargo("check --message-format=short") + p.cargo("check -Zpublic-dependency --message-format=short") .masquerade_as_nightly_cargo(&["public-dependency"]) .with_status(101) .with_stderr( @@ -214,8 +139,6 @@ fn workspace_pub_disallowed() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -266,8 +189,6 @@ fn allow_priv_in_tests() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -310,8 +231,6 @@ fn allow_priv_in_benchs() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -354,8 +273,6 @@ fn allow_priv_in_bins() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -399,8 +316,6 @@ fn allow_priv_in_examples() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -444,8 +359,6 @@ fn allow_priv_in_custom_build() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] - [package] name = "foo" version = "0.0.1" @@ -486,7 +399,6 @@ fn publish_package_with_public_dependency() { .file("src/lib.rs", "pub struct FromPub;") .publish(); Package::new("bar", "0.1.0") - .cargo_feature("public-dependency") .add_dep(Dependency::new("pub_bar", "0.1.0").public(true)) .file( "src/lib.rs", @@ -501,7 +413,6 @@ fn publish_package_with_public_dependency() { .file( "Cargo.toml", r#" - cargo-features = ["public-dependency"] [package] name = "foo" version = "0.0.1" @@ -518,7 +429,7 @@ fn publish_package_with_public_dependency() { ) .build(); - p.cargo("check --message-format=short") + p.cargo("check -Zpublic-dependency --message-format=short") .masquerade_as_nightly_cargo(&["public-dependency"]) .with_stderr( "\ @@ -534,3 +445,88 @@ fn publish_package_with_public_dependency() { ) .run() } + +#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")] +fn exported_pub_dep_without_z_public_dependency() { + Package::new("pub_dep", "0.1.0") + .file("src/lib.rs", "pub struct FromPub;") + .publish(); + + let p = project() + .file( + "Cargo.toml", + r#" + [package] + name = "foo" + version = "0.0.1" + + [dependencies] + pub_dep = {version = "0.1.0", public = true} + "#, + ) + .file( + "src/lib.rs", + " + extern crate pub_dep; + pub fn use_pub(_: pub_dep::FromPub) {} + ", + ) + .build(); + + p.cargo("check --message-format=short") + .masquerade_as_nightly_cargo(&["public-dependency"]) + .with_stderr( + "\ +[..]pub_dep is public, pass `-Zpublic-dependency` to enable support for it +[UPDATING] `[..]` index +[DOWNLOADING] crates ... +[DOWNLOADED] pub_dep v0.1.0 ([..]) +[CHECKING] pub_dep v0.1.0 +[CHECKING] foo v0.0.1 ([CWD]) +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +", + ) + .run(); +} + +#[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")] +fn exported_pub_dep_with_z_public_dependency() { + Package::new("pub_dep", "0.1.0") + .file("src/lib.rs", "pub struct FromPub;") + .publish(); + + let p = project() + .file( + "Cargo.toml", + r#" + [package] + name = "foo" + version = "0.0.1" + + [dependencies] + pub_dep = {version = "0.1.0", public = true} + "#, + ) + .file( + "src/lib.rs", + " + extern crate pub_dep; + pub fn use_pub(_: pub_dep::FromPub) {} + ", + ) + .build(); + + p.cargo("check -Zpublic-dependency --message-format=short") + .masquerade_as_nightly_cargo(&["public-dependency"]) + .with_stderr( + "\ +[UPDATING] `[..]` index +[DOWNLOADING] crates ... +[DOWNLOADED] pub_dep v0.1.0 ([..]) +[CHECKING] pub_dep v0.1.0 +[CHECKING] foo v0.0.1 ([CWD]) +[FINISHED] dev [unoptimized + debuginfo] target(s) in [..] +", + ) + .run(); +}