Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 54 additions & 54 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
resolver = "2"
resolver = "3"
members = [
"cli",
"lockfile",
Expand Down
2 changes: 1 addition & 1 deletion clap_markdown/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repository = "https://github.com/phylum-dev/cli"
categories = ["command-line-interface"]
keywords = ["clap", "cli", "generate", "markdown"]
license = "GPL-3.0-or-later"
rust-version = "1.63.0"
rust-version = "1.85.0"
version = "0.1.0"
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion clap_markdown/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ fn generate_argument(arg: &Arg) -> Option<String> {
}

// Add arguments.
if arg.get_num_args().map_or(false, |range| range.max_values() > 0) {
if arg.get_num_args().is_some_and(|range| range.max_values() > 0) {
let default_name = [arg.get_id().to_string().into()];
let value_names = arg.get_value_names().unwrap_or(&default_name);

Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "7.5.0"
authors = ["Veracode, Inc. <dl-phylum-engineering@veracode.com>"]
license = "GPL-3.0-or-later"
edition = "2021"
rust-version = "1.82.0"
rust-version = "1.85.0"
autotests = false

[[test]]
Expand Down
2 changes: 1 addition & 1 deletion lockfile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "Package lockfile parsers used by Phylum"
version = "0.1.0"
authors = ["Veracode, Inc. <dl-phylum-engineering@veracode.com>"]
edition = "2021"
rust-version = "1.70.0"
rust-version = "1.85.0"

[features]
default = []
Expand Down
2 changes: 1 addition & 1 deletion lockfile_generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Veracode, Inc. <dl-phylum-engineering@veracode.com>"]
license = "GPL-3.0-or-later"
edition = "2021"
rust-version = "1.68.0"
rust-version = "1.85.0"

[dependencies]
serde = { version = "1.0.163", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion lockfile_generator/src/npm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ pub(crate) fn find_workspace_root(manifest_path: impl AsRef<Path>) -> Result<Pat
// Check if original manifest location matches any workspace glob.
let is_root = workspaces.iter().any(|glob| {
let glob = glob.strip_prefix("./").unwrap_or(glob);
Pattern::new(glob).map_or(false, |pattern| pattern.matches_path(relative_path))
Pattern::new(glob).is_ok_and(|pattern| pattern.matches_path(relative_path))
});

if is_root {
Expand Down
2 changes: 1 addition & 1 deletion lockfile_generator/src/pip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl Generator for Pip {
let is_local_project = manifest_path
.file_name()
.and_then(|f| f.to_str())
.map_or(false, |file_name| file_name == "setup.py" || file_name == "pyproject.toml");
.is_some_and(|file_name| file_name == "setup.py" || file_name == "pyproject.toml");

if is_local_project {
command.arg(".");
Expand Down
Loading