Skip to content

Commit 3eb246c

Browse files
committed
Auto merge of #12960 - epage:refactor, r=weihanglo
refactor(toml): Consistently lead with 'Toml' prefix ### What does this PR try to resolve? Like with #12954, I noticed this inconsistency while working towards #12801 and wanted to fix it. ### How should we test and review this PR? ### Additional information
2 parents 984bd91 + 2c61a70 commit 3eb246c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/cargo/util/toml/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ impl schema::TomlManifest {
356356
Ok(d)
357357
}
358358
schema::MaybeWorkspace::Defined(schema::TomlDependency::Simple(s)) => {
359-
Ok(schema::DetailedTomlDependency {
359+
Ok(schema::TomlDetailedDependency {
360360
version: Some(s.clone()),
361361
..Default::default()
362362
})
@@ -1626,7 +1626,7 @@ impl schema::TomlWorkspaceDependency {
16261626
default_features_msg(name, None, cx);
16271627
}
16281628
if self.optional.is_some() || self.features.is_some() || self.public.is_some() {
1629-
schema::TomlDependency::Detailed(schema::DetailedTomlDependency {
1629+
schema::TomlDependency::Detailed(schema::TomlDetailedDependency {
16301630
version: Some(s),
16311631
optional: self.optional,
16321632
features: self.features.clone(),
@@ -1715,7 +1715,7 @@ impl<P: ResolveToPath + Clone> schema::TomlDependency<P> {
17151715
kind: Option<DepKind>,
17161716
) -> CargoResult<Dependency> {
17171717
match *self {
1718-
schema::TomlDependency::Simple(ref version) => schema::DetailedTomlDependency::<P> {
1718+
schema::TomlDependency::Simple(ref version) => schema::TomlDetailedDependency::<P> {
17191719
version: Some(version.clone()),
17201720
..Default::default()
17211721
}
@@ -1725,7 +1725,7 @@ impl<P: ResolveToPath + Clone> schema::TomlDependency<P> {
17251725
}
17261726
}
17271727

1728-
impl schema::DetailedTomlDependency {
1728+
impl schema::TomlDetailedDependency {
17291729
fn add_features(&mut self, features: Option<Vec<String>>) {
17301730
self.features = match (self.features.clone(), features.clone()) {
17311731
(Some(dep_feat), Some(inherit_feat)) => Some(
@@ -1762,7 +1762,7 @@ impl schema::DetailedTomlDependency {
17621762
}
17631763
}
17641764

1765-
impl<P: ResolveToPath + Clone> schema::DetailedTomlDependency<P> {
1765+
impl<P: ResolveToPath + Clone> schema::TomlDetailedDependency<P> {
17661766
fn to_dependency(
17671767
&self,
17681768
name_in_toml: &str,

src/cargo/util/toml/schema.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ pub enum TomlDependency<P: Clone = String> {
500500
/// The simple format is equivalent to a detailed dependency
501501
/// specifying only a version, eg.
502502
/// `package = { version = "<version>" }`
503-
Detailed(DetailedTomlDependency<P>),
503+
Detailed(TomlDetailedDependency<P>),
504504
}
505505

506506
impl TomlDependency {
@@ -544,7 +544,7 @@ impl<'de, P: Deserialize<'de> + Clone> de::Deserialize<'de> for TomlDependency<P
544544

545545
#[derive(Deserialize, Serialize, Clone, Debug)]
546546
#[serde(rename_all = "kebab-case")]
547-
pub struct DetailedTomlDependency<P: Clone = String> {
547+
pub struct TomlDetailedDependency<P: Clone = String> {
548548
pub version: Option<String>,
549549
pub registry: Option<String>,
550550
/// The URL of the `registry` field.
@@ -582,14 +582,14 @@ pub struct DetailedTomlDependency<P: Clone = String> {
582582
pub _unused_keys: BTreeMap<String, toml::Value>,
583583
}
584584

585-
impl<P: Clone> DetailedTomlDependency<P> {
585+
impl<P: Clone> TomlDetailedDependency<P> {
586586
pub fn default_features(&self) -> Option<bool> {
587587
self.default_features.or(self.default_features2)
588588
}
589589
}
590590

591591
// Explicit implementation so we avoid pulling in P: Default
592-
impl<P: Clone> Default for DetailedTomlDependency<P> {
592+
impl<P: Clone> Default for TomlDetailedDependency<P> {
593593
fn default() -> Self {
594594
Self {
595595
version: Default::default(),

0 commit comments

Comments
 (0)