Skip to content

Commit ff349f0

Browse files
committed
Remove publish-lockfile key from manifest.
The feature was stabilized without the key in #7026 about 1.5 years ago. (Will follow up with an error message in a subsequent commit.)
1 parent d89a78e commit ff349f0

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

src/cargo/core/manifest.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ pub struct Manifest {
3939
custom_metadata: Option<toml::Value>,
4040
profiles: Option<TomlProfiles>,
4141
publish: Option<Vec<String>>,
42-
publish_lockfile: bool,
4342
replace: Vec<(PackageIdSpec, Dependency)>,
4443
patch: HashMap<Url, Vec<Dependency>>,
4544
workspace: WorkspaceConfig,
@@ -374,7 +373,6 @@ impl Manifest {
374373
custom_metadata: Option<toml::Value>,
375374
profiles: Option<TomlProfiles>,
376375
publish: Option<Vec<String>>,
377-
publish_lockfile: bool,
378376
replace: Vec<(PackageIdSpec, Dependency)>,
379377
patch: HashMap<Url, Vec<Dependency>>,
380378
workspace: WorkspaceConfig,
@@ -407,7 +405,6 @@ impl Manifest {
407405
original,
408406
im_a_teapot,
409407
default_run,
410-
publish_lockfile,
411408
metabuild,
412409
resolve_behavior,
413410
}

src/cargo/util/toml/mod.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,6 @@ pub struct TomlProject {
825825
exclude: Option<Vec<String>>,
826826
include: Option<Vec<String>>,
827827
publish: Option<VecStringOrBool>,
828-
publish_lockfile: Option<bool>,
829828
workspace: Option<String>,
830829
im_a_teapot: Option<bool>,
831830
autobins: Option<bool>,
@@ -1304,19 +1303,6 @@ impl TomlManifest {
13041303
None | Some(VecStringOrBool::Bool(true)) => None,
13051304
};
13061305

1307-
let publish_lockfile = match project.publish_lockfile {
1308-
Some(b) => {
1309-
features.require(Feature::publish_lockfile())?;
1310-
warnings.push(
1311-
"The `publish-lockfile` feature is deprecated and currently \
1312-
has no effect. It may be removed in a future version."
1313-
.to_string(),
1314-
);
1315-
b
1316-
}
1317-
None => features.is_enabled(Feature::publish_lockfile()),
1318-
};
1319-
13201306
if summary.features().contains_key("default-features") {
13211307
warnings.push(
13221308
"`default-features = [\"..\"]` was found in [features]. \
@@ -1348,7 +1334,6 @@ impl TomlManifest {
13481334
custom_metadata,
13491335
profiles,
13501336
publish,
1351-
publish_lockfile,
13521337
replace,
13531338
patch,
13541339
workspace_config,

tests/testsuite/publish_lockfile.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ fn deprecated() {
5252
"\
5353
[PACKAGING] foo v0.1.0 ([..])
5454
[VERIFYING] foo v0.1.0 ([..])
55-
[WARNING] The `publish-lockfile` feature is deprecated and currently has no effect. \
56-
It may be removed in a future version.
5755
[COMPILING] foo v0.1.0 ([..])
5856
[FINISHED] dev [..]
5957
",

0 commit comments

Comments
 (0)