Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(schemas): Pull out as cargo-util-schemas #13178

Merged
merged 4 commits into from
Dec 18, 2023
Merged

refactor(schemas): Pull out as cargo-util-schemas #13178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift click to select a range
19bcb3b
refactor(util): Move VersionExt back into main cargo crate
epage Dec 15, 2023
370cd35
refactor(schema): Move PartialVersion into schemas
epage Dec 15, 2023
1b6d864
refactor(sources): Don't impl on schema types
epage Dec 15, 2023
633929d
refactor(schemas): Pull out `cargo-util-schemas` crate
epage Dec 15, 2023
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
Prev Previous commit
Next Next commit
refactor(schema): Move PartialVersion into schemas
  • Loading branch information
@epage
epage committed Dec 15, 2023
commit 370cd354340aaabda36ef24964256bbec465a736
1 change: 0 additions & 1 deletion src/cargo/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 153,6 @@ pub mod ops;
pub mod sources;
pub mod util;
pub mod util_schemas;
pub mod util_semver;
mod version;

pub fn exit_with_error(err: CliError, shell: &mut Shell) -> ! {
Expand Down
2 changes: 2 additions & 0 deletions src/cargo/util_schemas/core/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 1,8 @@
mod package_id_spec;
mod partial_version;
mod source_kind;

pub use package_id_spec::PackageIdSpec;
pub use partial_version::PartialVersion;
pub use source_kind::GitReference;
pub use source_kind::SourceKind;
2 changes: 1 addition & 1 deletion src/cargo/util_schemas/core/package_id_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 7,9 @@ use serde::{de, ser};
use url::Url;

use crate::util_schemas::core::GitReference;
use crate::util_schemas::core::PartialVersion;
use crate::util_schemas::core::SourceKind;
use crate::util_schemas::manifest::PackageName;
use crate::util_semver::PartialVersion;

/// Some or all of the data required to identify a package:
///
Expand Down
0 src/cargo/util_semver.rs → ...argo/util_schemas/core/partial_version.rs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/cargo/util_schemas/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 17,8 @@ use serde::{Deserialize, Serialize};
use serde_untagged::UntaggedEnumVisitor;

use crate::util_schemas::core::PackageIdSpec;
use crate::util_schemas::core::PartialVersion;
use crate::util_schemas::restricted_names;
use crate::util_semver::PartialVersion;

/// This type is used to deserialize `Cargo.toml` files.
#[derive(Debug, Deserialize, Serialize)]
Expand Down