Skip to content

Commit

Permalink
Remove packages_filter feature from scarb-metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
mkaput committed Aug 25, 2023
1 parent 6052df8 commit f3a96bc
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 282 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions scarb-metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ repository.workspace = true

[dependencies]
camino.workspace = true
clap = { workspace = true, optional = true }
derive_builder = { workspace = true, optional = true }
semver.workspace = true
serde.workspace = true
Expand All @@ -30,4 +29,3 @@ snapbox.workspace = true
default = ["command"]
builder = ["dep:derive_builder"]
command = ["dep:thiserror"]
packages_filter = ["dep:clap", "dep:thiserror"]
13 changes: 0 additions & 13 deletions scarb-metadata/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,12 @@ use derive_builder::Builder;
use semver::{Version, VersionReq};
use serde::{Deserialize, Serialize};

#[cfg(feature = "packages_filter")]
#[allow(deprecated)]
use crate::packages_filter::WithManifestPath;
#[cfg(feature = "command")]
pub use command::*;
pub use version_pin::*;

#[cfg(feature = "command")]
mod command;
#[cfg(feature = "packages_filter")]
pub mod packages_filter;
mod version_pin;

/// An "opaque" identifier for a package.
Expand Down Expand Up @@ -486,14 +481,6 @@ impl PackageMetadata {
}
}

#[cfg(feature = "packages_filter")]
#[allow(deprecated)]
impl WithManifestPath for PackageMetadata {
fn manifest_path(&self) -> &Utf8Path {
&self.manifest_path
}
}

impl TargetMetadata {
/// Path to the main source directory of the target.
pub fn source_root(&self) -> &Utf8Path {
Expand Down
265 changes: 0 additions & 265 deletions scarb-metadata/src/packages_filter.rs

This file was deleted.

2 changes: 1 addition & 1 deletion scarb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ once_cell.workspace = true
pathdiff.workspace = true
petgraph.workspace = true
scarb-build-metadata = { path = "../utils/scarb-build-metadata" }
scarb-metadata = { path = "../scarb-metadata", default-features = false, features = ["builder", "packages_filter"] }
scarb-metadata = { path = "../scarb-metadata", default-features = false, features = ["builder"] }
scarb-ui = { path = "../utils/scarb-ui" }
semver.workspace = true
serde-value.workspace = true
Expand Down

0 comments on commit f3a96bc

Please sign in to comment.