Revert tilde version requirements for runtime crates (#3122) (299f6ae1) · Commits · Public Repositories / Smithy Rust

tools/ci-build/publisher/src/package.rs

+39 −139

Original line number	Diff line number	Diff line
		@@ -10,77 +10,14 @@ use crate::sort::dependency_order;
		use crate::RUST_SDK_CI_OWNER;
		use anyhow::{Context, Result};
		use cargo_toml::{Dependency, DepsSet, Manifest};
		use semver::Version;
		use smithy_rs_tool_common::package::PackageCategory;
		use std::collections::{BTreeMap, BTreeSet, HashSet};
		use std::error::Error as StdError;
		use std::fmt;
		use std::fmt::Formatter;
		use std::path::{Path, PathBuf};
		use std::str::FromStr;
		use tokio::fs;
		use tracing::{error, warn};

		/// A trait that marks a type that can be created from `&str` and turned into
		/// [`Version`]
		///
		/// This trait is purely for convenience to reduce the number of generic parameters for functions,
		/// that is, the functions only need to have a single generic parameter that implements this trait
		/// instead of having to specify `ParsedT` and `Err` separately.
		pub trait ParseIntoVersion {
		type ParsedT: FromStr<Err = Self::Err> + Into<Version>;
		type Err: Into<BoxError>;
		}

		/// A type that indicates the `SemVer` variant of [`Version`] will be created as a result of parsing
		pub struct SemVer;
		impl ParseIntoVersion for SemVer {
		type ParsedT = semver::Version;
		type Err = semver::Error;
		}

		/// A type that indicates the `Lenient` variant of [`Version`] will be created as a result of parsing
		pub struct VersionRequirement;
		impl ParseIntoVersion for VersionRequirement {
		type ParsedT = String;
		type Err = std::convert::Infallible;
		}

		/// An enum that handles both semver as well as string values that do not adhere to the semver
		/// specification.
		///
		/// Most of the time, the `SemVer` variant will be used when manifest files are parsed into an
		/// in-memory data structure. Those version strings can appear under the `[package]` section as
		/// well as the dependency table within a manifest file.
		/// The `VersionRequirement` variant is used when the `fix_manifests` subcommand and the
		/// `generate_version_manifest` subcommand are executed, allowing version strings to be parsed into
		/// tilde version requirements.
		#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
		pub enum Version {
		SemVer(semver::Version),
		VersionRequirement(String),
		}

		impl From<semver::Version> for Version {
		fn from(version: semver::Version) -> Self {
		Version::SemVer(version)
		}
		}

		impl From<String> for Version {
		fn from(s: String) -> Self {
		Version::VersionRequirement(s)
		}
		}

		impl fmt::Display for Version {
		fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
		let version = match self {
		Version::SemVer(v) => v.to_string(),
		Version::VersionRequirement(s) => s.clone(),
		};
		write!(f, "{}", version)
		}
		}
		use tracing::warn;

		/// Information required to identify a package (crate).
		#[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd)]
		@@ -90,10 +27,10 @@ pub struct PackageHandle {
		}

		impl PackageHandle {
		pub fn new(name: impl Into<String>, version: impl Into<Version>) -> Self {
		pub fn new(name: impl Into<String>, version: Version) -> Self {
		Self {
		name: name.into(),
		version: version.into(),
		version,
		}
		}
		}
		@@ -208,7 +145,7 @@ pub async fn discover_and_validate_package_batches(
		fs: Fs,
		path: impl AsRef<Path>,
		) -> Result<(Vec<PackageBatch>, PackageStats)> {
		let packages = discover_packages::<VersionRequirement>(fs, path.as_ref().into())
		let packages = discover_packages(fs, path.as_ref().into())
		.await?
		.into_iter()
		.filter(\|package\| package.publish == Publish::Allowed)
		@@ -234,8 +171,6 @@ pub enum Error {
		MissingVersion(PathBuf, String),
		#[error("crate {0} has multiple versions: {1} and {2}")]
		MultipleVersions(String, Version, Version),
		#[error("multiple version requirements have been specified for crate {0}: {1} and {2}")]
		MultipleVersionRequirements(String, Version, Version),
		}

		/// Discovers all Cargo.toml files under the given path recursively
		@@ -257,24 +192,18 @@ pub async fn discover_manifests(path: PathBuf) -> Result<Vec<PathBuf>> {
		}

		/// Discovers and parses all Cargo.toml files that are packages (as opposed to being exclusively workspaces)
		pub async fn discover_packages<P: ParseIntoVersion>(fs: Fs, path: PathBuf) -> Result<Vec<Package>> {
		pub async fn discover_packages(fs: Fs, path: PathBuf) -> Result<Vec<Package>> {
		let manifest_paths = discover_manifests(path).await?;
		read_packages::<P>(fs, manifest_paths).await
		read_packages(fs, manifest_paths).await
		}

		/// Parses `version` into [`Version`] and adds additional error context when parsing fails.
		pub fn parse_version<P: ParseIntoVersion>(
		manifest_path: &Path,
		version: &str,
		) -> Result<P::ParsedT, Error> {
		P::ParsedT::from_str(version)
		/// Parses a semver version number and adds additional error context when parsing fails.
		pub fn parse_version(manifest_path: &Path, version: &str) -> Result<Version, Error> {
		Version::parse(version)
		.map_err(\|err\| Error::InvalidCrateVersion(manifest_path.into(), version.into(), err.into()))
		}

		fn read_dependencies<P: ParseIntoVersion>(
		path: &Path,
		dependencies: &DepsSet,
		) -> Result<Vec<PackageHandle>> {
		fn read_dependencies(path: &Path, dependencies: &DepsSet) -> Result<Vec<PackageHandle>> {
		let mut result = Vec::new();
		for (name, metadata) in dependencies {
		match metadata {
		@@ -284,7 +213,7 @@ fn read_dependencies<P: ParseIntoVersion>(
		let version = detailed
		.version
		.as_ref()
		.map(\|version\| parse_version::<P>(path, version))
		.map(\|version\| parse_version(path, version))
		.ok_or_else(\|\| Error::MissingVersion(path.into(), name.into()))??;
		result.push(PackageHandle::new(name, version));
		}
		@@ -296,29 +225,24 @@ fn read_dependencies<P: ParseIntoVersion>(
		}

		/// Returns `Ok(None)` when the Cargo.toml is a workspace rather than a package
		fn read_package<P: ParseIntoVersion>(
		path: &Path,
		manifest_bytes: &[u8],
		) -> Result<Option<Package>> {
		fn read_package(path: &Path, manifest_bytes: &[u8]) -> Result<Option<Package>> {
		let mut manifest = Manifest::from_slice(manifest_bytes)
		.with_context(\|\| format!("failed to load package manifest for {:?}", path))?;
		manifest.complete_from_path(path)?;
		if let Some(package) = manifest.package {
		let name = package.name;
		let version = parse_version::<P>(path, &package.version.unwrap())?;
		let handle = PackageHandle::new(name, version);
		let version = parse_version(path, &package.version.unwrap())?;
		let handle = PackageHandle { name, version };
		let publish = match package.publish.unwrap() {
		cargo_toml::Publish::Flag(true) => Publish::Allowed,
		_ => Publish::NotAllowed,
		};

		let mut local_dependencies = BTreeSet::new();
		local_dependencies.extend(read_dependencies(path, &manifest.dependencies)?.into_iter());
		local_dependencies.extend(read_dependencies(path, &manifest.dev_dependencies)?.into_iter());
		local_dependencies
		.extend(read_dependencies::<P>(path, &manifest.dependencies)?.into_iter());
		local_dependencies
		.extend(read_dependencies::<P>(path, &manifest.dev_dependencies)?.into_iter());
		local_dependencies
		.extend(read_dependencies::<P>(path, &manifest.build_dependencies)?.into_iter());
		.extend(read_dependencies(path, &manifest.build_dependencies)?.into_iter());
		Ok(Some(Package::new(
		handle,
		path,
		@@ -333,63 +257,38 @@ fn read_package<P: ParseIntoVersion>(
		/// Validates that all of the publishable crates use consistent version numbers
		/// across all of their local dependencies.
		fn validate_packages(packages: &[Package]) -> Result<()> {
		fn track_version<F>(
		handle: &PackageHandle,
		map: &mut BTreeMap<String, Version>,
		error_generator: F,
		) -> Result<(), Error>
		where
		F: FnOnce(String, Version, Version) -> Result<(), Error>,
		{
		if let Some(version) = map.get(&handle.name) {
		let mut versions: BTreeMap<String, Version> = BTreeMap::new();
		let track_version = &mut \|handle: &PackageHandle\| -> Result<(), Error> {
		if let Some(version) = versions.get(&handle.name) {
		if *version != handle.version {
		error_generator(
		Err(Error::MultipleVersions(
		(&handle.name).into(),
		map[&handle.name].clone(),
		versions[&handle.name].clone(),
		handle.version.clone(),
		)
		))
		} else {
		Ok(())
		}
		} else {
		map.insert(handle.name.clone(), handle.version.clone());
		versions.insert(handle.name.clone(), handle.version.clone());
		Ok(())
		}
		}
		let mut versions: BTreeMap<String, Version> = BTreeMap::new();
		let mut version_requirements: BTreeMap<String, Version> = BTreeMap::new();
		};
		for package in packages {
		track_version(
		&package.handle,
		&mut versions,
		\|crate_name, version_a, version_b\| {
		Err(Error::MultipleVersions(crate_name, version_a, version_b))
		},
		)?;
		track_version(&package.handle)?;
		for dependency in &package.local_dependencies {
		track_version(
		dependency,
		&mut version_requirements,
		\|crate_name, version_a, version_b\| {
		Err(Error::MultipleVersionRequirements(
		crate_name, version_a, version_b,
		))
		},
		)?;
		track_version(dependency)?;
		}
		}

		Ok(())
		}

		pub async fn read_packages<P: ParseIntoVersion>(
		fs: Fs,
		manifest_paths: Vec<PathBuf>,
		) -> Result<Vec<Package>> {
		pub async fn read_packages(fs: Fs, manifest_paths: Vec<PathBuf>) -> Result<Vec<Package>> {
		let mut result = Vec::new();
		for path in &manifest_paths {
		let contents: Vec<u8> = fs.read_file(path).await?;
		if let Some(package) = read_package::<P>(path, &contents)? {
		if let Some(package) = read_package(path, &contents)? {
		result.push(package);
		}
		}
		@@ -438,10 +337,11 @@ fn batch_packages(packages: Vec<Package>) -> Result<Vec<PackageBatch>> {
		#[cfg(test)]
		mod tests {
		use super::*;
		use semver::Version;
		use std::path::PathBuf;

		fn version(version: &str) -> Version {
		semver::Version::parse(version).unwrap().into()
		Version::parse(version).unwrap()
		}

		#[test]
		@@ -465,7 +365,7 @@ mod tests {
		"#;
		let path: PathBuf = "test/Cargo.toml".into();

		let package = read_package::<SemVer>(&path, manifest)
		let package = read_package(&path, manifest)
		.expect("parse success")
		.expect("is a package");
		assert_eq!("test", package.handle.name);
		@@ -495,7 +395,7 @@ mod tests {

		let error = format!(
		"{}",
		read_package::<SemVer>(&path, manifest).expect_err("should fail")
		read_package(&path, manifest).expect_err("should fail")
		);
		assert!(
		error.contains("Invalid crate version"),
		@@ -506,11 +406,11 @@ mod tests {

		fn package(name: &str, dependencies: &[&str]) -> Package {
		Package::new(
		PackageHandle::new(name, semver::Version::parse("1.0.0").unwrap()),
		PackageHandle::new(name, Version::parse("1.0.0").unwrap()),
		format!("{}/Cargo.toml", name),
		dependencies
		.iter()
		.map(\|d\| PackageHandle::new(*d, semver::Version::parse("1.0.0").unwrap()))
		.map(\|d\| PackageHandle::new(*d, Version::parse("1.0.0").unwrap()))
		.collect(),
		Publish::Allowed,
		)
		@@ -588,11 +488,11 @@ mod tests {

		fn pkg_ver(name: &str, version: &str, dependencies: &[(&str, &str)]) -> Package {
		Package::new(
		PackageHandle::new(name, semver::Version::parse(version).unwrap()),
		PackageHandle::new(name, Version::parse(version).unwrap()),
		format!("{}/Cargo.toml", name),
		dependencies
		.iter()
		.map(\|p\| PackageHandle::new(p.0, semver::Version::parse(p.1).unwrap()))
		.map(\|p\| PackageHandle::new(p.0, Version::parse(p.1).unwrap()))
		.collect(),
		Publish::Allowed,
		)
		@@ -628,7 +528,7 @@ mod tests {
		])
		.expect_err("fail");
		assert_eq!(
		"multiple version requirements have been specified for crate A: 1.1.0 and 1.0.0",
		"crate A has multiple versions: 1.1.0 and 1.0.0",
		format!("{}", error)
		);
		}

tools/ci-build/publisher/src/sort.rs

+13 −14

Original line number	Diff line number	Diff line
		@@ -12,9 +12,9 @@ use std::collections::{BTreeMap, BTreeSet};
		/// Determines the dependency order of the given packages.
		pub fn dependency_order(packages: Vec<Package>) -> Result<Vec<Package>> {
		let mut order = Vec::new();
		let mut packages: BTreeMap<String, Package> = packages
		let mut packages: BTreeMap<PackageHandle, Package> = packages
		.into_iter()
		.map(\|p\| (p.handle.name.clone(), p))
		.map(\|p\| (p.handle.clone(), p))
		.collect();
		let mut visited = BTreeSet::new();

		@@ -22,7 +22,7 @@ pub fn dependency_order(packages: Vec<Package>) -> Result<Vec<Package>> {
		to_visit.sort_by(\|a, b\| a.local_dependencies.len().cmp(&b.local_dependencies.len()));

		// Depth-first search topological sort
		while let Some(package) = to_visit.iter().find(\|e\| !visited.contains(&e.handle.name)) {
		while let Some(package) = to_visit.iter().find(\|e\| !visited.contains(&e.handle)) {
		dependency_order_visit(
		&package.handle,
		&packages,
		@@ -34,28 +34,27 @@ pub fn dependency_order(packages: Vec<Package>) -> Result<Vec<Package>> {

		Ok(order
		.into_iter()
		.map(&mut \|handle: PackageHandle\| packages.remove(&handle.name).unwrap())
		.map(&mut \|handle: PackageHandle\| packages.remove(&handle).unwrap())
		.collect())
		}

		fn dependency_order_visit(
		package_handle: &PackageHandle,
		packages: &BTreeMap<String, Package>,
		stack: &mut BTreeSet<String>,
		visited: &mut BTreeSet<String>,
		packages: &BTreeMap<PackageHandle, Package>,
		stack: &mut BTreeSet<PackageHandle>,
		visited: &mut BTreeSet<PackageHandle>,
		result: &mut Vec<PackageHandle>,
		) -> Result<()> {
		let crate_name = &package_handle.name;
		if visited.contains(crate_name) {
		if visited.contains(package_handle) {
		return Ok(());
		}
		if stack.contains(crate_name) {
		if stack.contains(package_handle) {
		tracing::error!(stack = ?stack, handle = ?package_handle, "dependency cycle!");
		bail!("dependency cycle detected");
		}
		stack.insert(crate_name.clone());
		stack.insert(package_handle.clone());
		let local_dependencies = &packages
		.get(crate_name)
		.get(package_handle)
		.ok_or_else(\|\| {
		dbg!(packages);
		anyhow!("packages to publish doesn't contain {:?}", package_handle)
		@@ -64,8 +63,8 @@ fn dependency_order_visit(
		for dependency in local_dependencies {
		dependency_order_visit(dependency, packages, stack, visited, result)?;
		}
		stack.remove(crate_name);
		visited.insert(crate_name.clone());
		stack.remove(package_handle);
		visited.insert(package_handle.clone());
		result.push(package_handle.clone());
		Ok(())
		}

tools/ci-build/publisher/src/subcommand/claim_crate_names.rs

+4 −3

Original line number	Diff line number	Diff line
		@@ -3,12 +3,13 @@
		* SPDX-License-Identifier: Apache-2.0
		*/
		use crate::fs::Fs;
		use crate::package::{discover_packages, PackageHandle, Publish, SemVer};
		use crate::package::{discover_packages, PackageHandle, Publish};
		use crate::publish::{has_been_published_on_crates_io, publish};
		use crate::subcommand::publish::correct_owner;
		use crate::{cargo, SDK_REPO_NAME};
		use clap::Parser;
		use dialoguer::Confirm;
		use semver::Version;
		use smithy_rs_tool_common::git;
		use smithy_rs_tool_common::package::PackageCategory;
		use std::collections::HashSet;
		@@ -61,7 +62,7 @@ async fn claim_crate_name(name: &str) -> anyhow::Result<()> {
		create_dummy_lib_crate(Fs::Real, name, crate_dir_path.to_path_buf()).await?;

		let category = PackageCategory::from_package_name(name);
		let package_handle = PackageHandle::new(name, semver::Version::new(0, 0, 1));
		let package_handle = PackageHandle::new(name, Version::new(0, 0, 1));
		publish(&package_handle, crate_dir_path).await?;
		// Keep things slow to avoid getting throttled by crates.io
		tokio::time::sleep(Duration::from_secs(2)).await;
		@@ -76,7 +77,7 @@ async fn discover_publishable_crate_names(repository_root: &Path) -> anyhow::Res
		fs: Fs,
		path: PathBuf,
		) -> anyhow::Result<HashSet<String>> {
		let packages = discover_packages::<SemVer>(fs, path).await?;
		let packages = discover_packages(fs, path).await?;
		let mut publishable_package_names = HashSet::new();
		for package in packages {
		if let Publish::Allowed = package.publish {

tools/ci-build/publisher/src/subcommand/fix_manifests.rs

+16 −120

Original line number	Diff line number	Diff line
		@@ -10,12 +10,12 @@
		//! version numbers in addition to the dependency path.

		use crate::fs::Fs;
		use crate::package::{discover_manifests, parse_version, SemVer};
		use crate::package::{discover_manifests, parse_version};
		use crate::SDK_REPO_NAME;
		use anyhow::{bail, Context, Result};
		use clap::Parser;
		use semver::Version;
		use smithy_rs_tool_common::ci::running_in_ci;
		use smithy_rs_tool_common::package::PackageCategory;
		use std::collections::BTreeMap;
		use std::ffi::OsStr;
		use std::path::{Path, PathBuf};
		@@ -93,7 +93,7 @@ enum FilterType {
		}
		struct VersionView<'a>(&'a Versions, FilterType);
		impl VersionView<'_> {
		fn get(&self, crate_name: &str) -> Option<&semver::Version> {
		fn get(&self, crate_name: &str) -> Option<&Version> {
		let version = match (self.1, self.0 .0.get(crate_name)) {
		(FilterType::AllCrates, version) => version,
		(FilterType::PublishedOnly, v @ Some(VersionWithMetadata { publish: true, .. })) => v,
		@@ -112,20 +112,20 @@ impl Versions {
		VersionView(self, FilterType::PublishedOnly)
		}

		fn published_crates(&self) -> impl Iterator<Item = (&str, &semver::Version)> + '_ {
		fn published_crates(&self) -> impl Iterator<Item = (&str, &Version)> + '_ {
		self.0
		.iter()
		.filter(\|(_, v)\| v.publish)
		.map(\|(k, v)\| (k.as_str(), &v.version))
		}

		fn get(&self, crate_name: &str) -> Option<&semver::Version> {
		fn get(&self, crate_name: &str) -> Option<&Version> {
		self.0.get(crate_name).map(\|v\| &v.version)
		}
		}

		struct VersionWithMetadata {
		version: semver::Version,
		version: Version,
		publish: bool,
		}

		@@ -162,7 +162,7 @@ fn package_versions(manifests: &[Manifest]) -> Result<Versions> {
		.ok_or_else(\|\| {
		anyhow::Error::msg(format!("{:?} is missing a package version", manifest.path))
		})?;
		let version = parse_version::<SemVer>(&manifest.path, version)?;
		let version = parse_version(&manifest.path, version)?;
		versions.insert(name.into(), VersionWithMetadata { version, publish });
		}
		Ok(Versions(versions))
		@@ -189,35 +189,21 @@ fn fix_dep_set(versions: &VersionView, key: &str, metadata: &mut Value) -> Resul
		}

		// Update a version of `dep_name` that has a path dependency to be that appearing in `versions`.
		//
		// While doing so, we will use the tilde version requirement so customers can update patch versions
		// automatically. Specifically, we use tilde versions of the form `~major.minor` (e.g. `~1.2`) so
		// it can support the range of versions `>=1.2.0, <1.3.0`. See
		// https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#tilde-requirements
		fn update_dep(table: &mut Table, dep_name: &str, versions: &VersionView) -> Result<usize> {
		if !table.contains_key("path") {
		return Ok(0);
		}
		let package_version = versions
		.get(dep_name)
		.ok_or_else(\|\| anyhow::Error::msg(format!("version not found for crate {dep_name}")))?;
		let package_version = if PackageCategory::from_package_name(dep_name) == PackageCategory::AwsSdk
		{
		// For a crate that depends on an SDK crate (e.g. `aws-config` depending on `aws-sdk-sts`),
		// we do _not_ want to turn the version of the SDK crate into a tilde version because
		// customers may depend on that SDK crate by themselves, causing multiple versions of it
		// to be brought in to their crate graph.
		package_version.to_string()
		} else {
		convert_to_tilde_requirement(package_version)?
		let package_version = match versions.get(dep_name) {
		Some(version) => version.to_string(),
		None => bail!("version not found for crate {}", dep_name),
		};
		let previous_version = table.insert(
		"version".into(),
		toml::Value::String(package_version.clone()),
		toml::Value::String(package_version.to_string()),
		);
		match previous_version {
		None => Ok(1),
		Some(prev_version) if versions_match(&prev_version, &package_version) => Ok(0),
		Some(prev_version) if prev_version.as_str() == Some(&package_version) => Ok(0),
		Some(mismatched_version) => {
		tracing::warn!(expected = ?package_version, actual = ?mismatched_version, "version was set but it did not match");
		Ok(1)
		@@ -225,49 +211,6 @@ fn update_dep(table: &mut Table, dep_name: &str, versions: &VersionView) -> Resu
		}
		}

		// Convert `package_version` into a tilde version requirement
		//
		// For instance, given `package_version` like `0.12.3`, the function returns `~0.12`.
		// The fact that this function takes a `semver::Version` means one can only convert a complete
		// semver `x.y.z` into a tilde version requirement, but not those like `0.21.0-alpha.1`.
		fn convert_to_tilde_requirement(package_version: &semver::Version) -> Result<String> {
		// `package_version` is from the `semver` crate which requires versions to have 3 components,
		// major, minor, and patch. So it is safe to assume its string value follows that format.
		let package_version = package_version.to_string();
		let package_version = match package_version.rfind('.') {
		// Here, we're interested in the `major.minor` part.
		Some(index) => {
		assert_eq!(
		2,
		package_version.chars().filter(\|&c\| c == '.').count(),
		"The number of `.` in {} is not 2",
		package_version
		);
		&package_version[0..index]
		}
		None => bail!("{} did not have any dots in it", package_version),
		};

		Ok("~".to_string() + package_version)
		}

		// Determines if `prev_version` and `current_version` are considered a match
		//
		// Each input can be either a semver-compliant version or a tilde version requirement.
		fn versions_match(prev_version: &Value, current_version: &str) -> bool {
		match prev_version.as_str() {
		Some(prev_version) => {
		if prev_version == current_version {
		return true;
		}
		let prev_version = prev_version.strip_prefix('~').unwrap_or(prev_version);
		let current_version = current_version.strip_prefix('~').unwrap_or(current_version);
		prev_version.starts_with(current_version) \|\| current_version.starts_with(prev_version)
		}
		_ => false,
		}
		}

		fn fix_dep_sets(versions: &VersionView, metadata: &mut toml::Value) -> Result<usize> {
		let mut changed = fix_dep_set(versions, "dependencies", metadata)?;
		// allow dev dependencies to be unpublished
		@@ -384,7 +327,7 @@ mod tests {
		(
		name.to_string(),
		VersionWithMetadata {
		version: semver::Version::parse(&version).unwrap(),
		version: Version::parse(&version).unwrap(),
		publish,
		},
		)
		@@ -470,7 +413,7 @@ mod tests {
		\n\
		[local_something]\n\
		path = \"../local_something\"\n\
		version = \"~1.1\"\n\
		version = \"1.1.3\"\n\
		",
		actual_deps.to_string()
		);
		@@ -482,7 +425,7 @@ mod tests {
		\n\
		[local_dev_something]\n\
		path = \"../local_dev_something\"\n\
		version = \"~0.1\"\n\
		version = \"0.1.0\"\n\
		",
		actual_dev_deps.to_string()
		);
		@@ -494,40 +437,9 @@ mod tests {
		\n\
		[local_build_something]\n\
		path = \"../local_build_something\"\n\
		version = \"~0.2\"\n\
		",
		actual_build_deps.to_string()
		);
		}

		#[test]
		fn sdk_crate_version_should_not_be_turned_into_tilde_requirement() {
		let manifest = br#"
		[package]
		name = "test"
		version = "1.2.0-preview"

		[dependencies]
		aws-sdk-example = { path = "../aws/sdk/example" }
		"#;
		let metadata = toml::from_slice(manifest).unwrap();
		let mut manifest = Manifest {
		path: "test".into(),
		metadata,
		};
		let versions = &[("aws-sdk-example", "0.2.0", true)];
		let versions = make_versions(versions.iter());

		fix_dep_sets(&versions.published(), &mut manifest.metadata).expect("success");

		let actual_deps = &manifest.metadata["dependencies"];
		assert_eq!(
		"\
		[aws-sdk-example]\n\
		path = \"../aws/sdk/example\"\n\
		version = \"0.2.0\"\n\
		",
		actual_deps.to_string()
		actual_build_deps.to_string()
		);
		}

		@@ -547,20 +459,4 @@ mod tests {
		"aws-sdk-rust/examples/foo/bar/Cargo.toml"
		));
		}

		#[test]
		fn test_versions_match() {
		assert!(versions_match(&Value::String("0.56.1".to_owned()), "~0.56"));
		assert!(versions_match(&Value::String("~0.56".to_owned()), "0.56.1"));
		assert!(!versions_match(&Value::String("~0.56".to_owned()), "~0.57"));
		assert!(!versions_match(&Value::String("~0.57".to_owned()), "~0.56"));
		assert!(!versions_match(
		&Value::String("0.56.1".to_owned()),
		"0.56.2"
		));
		assert!(!versions_match(
		&Value::String("0.56.1".to_owned()),
		"0.57.1"
		));
		}
		}

tools/ci-build/publisher/src/subcommand/fix_manifests/validate.rs

+3 −2

File changed.

Preview size limit exceeded, changes collapsed.