diff --git a/Cargo.lock b/Cargo.lock index 6dcfed727b7..907e34bc4a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -524,7 +524,7 @@ version = "0.4.11" [[package]] name = "cargo-test-support" -version = "0.11.1" +version = "0.11.2" dependencies = [ "anstream 1.0.0", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index a856f3313e4..bd73c3e9db7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ cargo-credential-macos-keychain = { version = "0.4.21", path = "credential/cargo cargo-credential-wincred = { version = "0.4.21", path = "credential/cargo-credential-wincred" } cargo-platform = { path = "crates/cargo-platform", version = "0.3.3" } cargo-test-macro = { version = "0.4.10", path = "crates/cargo-test-macro" } -cargo-test-support = { version = "0.11.0", path = "crates/cargo-test-support" } +cargo-test-support = { version = "0.11.2", path = "crates/cargo-test-support" } cargo-util = { version = "0.2.28", path = "crates/cargo-util" } cargo-util-schemas = { version = "0.13.0", path = "crates/cargo-util-schemas" } cargo-util-terminal = { version = "0.1.0", path = "crates/cargo-util-terminal" } @@ -157,7 +157,6 @@ name = "cargo" path = "src/cargo/lib.rs" [dependencies] -annotate-snippets.workspace = true anstream.workspace = true anstyle.workspace = true anstyle-progress.workspace = true diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 6d595c5662e..78bb490ba34 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-test-support" -version = "0.11.1" +version = "0.11.2" edition.workspace = true rust-version = "1.94" # MSRV:1 license.workspace = true diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs index 0fe13139f4f..2bb1b8d1660 100644 --- a/crates/cargo-test-support/src/lib.rs +++ b/crates/cargo-test-support/src/lib.rs @@ -81,6 +81,8 @@ macro_rules! t { } pub use cargo_util::ProcessBuilder; +#[doc(inline)] +pub use snapbox; pub use snapbox::file; pub use snapbox::str; pub use snapbox::utils::current_dir; diff --git a/crates/cargo-util-terminal/src/lib.rs b/crates/cargo-util-terminal/src/lib.rs index 27b74f2b7d7..8c7711e4421 100644 --- a/crates/cargo-util-terminal/src/lib.rs +++ b/crates/cargo-util-terminal/src/lib.rs @@ -10,6 +10,7 @@ mod shell; pub mod style; +pub use annotate_snippets as report; pub use shell::ColorChoice; pub use shell::Hyperlink; pub use shell::Shell; diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 249ed98b70e..83eba6895a7 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -1,8 +1,8 @@ -use annotate_snippets::Level; use anyhow::{Context as _, anyhow}; use cargo::core::{CliUnstable, features}; use cargo::util::context::TermConfig; use cargo::{CargoResult, drop_print, drop_println}; +use cargo_util_terminal::report::Level; use clap::builder::UnknownArgumentValueParser; use itertools::Itertools; use std::collections::HashMap; diff --git a/src/bin/cargo/commands/tree.rs b/src/bin/cargo/commands/tree.rs index f7af78263bd..e1ebcb6e19b 100644 --- a/src/bin/cargo/commands/tree.rs +++ b/src/bin/cargo/commands/tree.rs @@ -1,12 +1,12 @@ use crate::cli; use crate::command_prelude::*; -use annotate_snippets::Level; use anyhow::{bail, format_err}; use cargo::core::dependency::DepKind; use cargo::ops::Packages; use cargo::ops::tree::{self, DisplayDepth, EdgeKind}; use cargo::util::CargoResult; use cargo::util::print_available_packages; +use cargo_util_terminal::report::Level; use clap_complete::ArgValueCandidates; use std::collections::HashSet; use std::str::FromStr; diff --git a/src/cargo/core/compiler/build_runner/mod.rs b/src/cargo/core/compiler/build_runner/mod.rs index 957fecf55eb..9c2d5bb882d 100644 --- a/src/cargo/core/compiler/build_runner/mod.rs +++ b/src/cargo/core/compiler/build_runner/mod.rs @@ -10,9 +10,9 @@ use crate::core::compiler::locking::LockManager; use crate::core::compiler::{self, Unit, UserIntent, artifact}; use crate::util::cache_lock::CacheLockMode; use crate::util::errors::CargoResult; -use annotate_snippets::{Level, Message}; use anyhow::{Context as _, bail}; use cargo_util::paths; +use cargo_util_terminal::report::{Level, Message}; use filetime::FileTime; use itertools::Itertools; use jobserver::Client; diff --git a/src/cargo/core/compiler/future_incompat.rs b/src/cargo/core/compiler/future_incompat.rs index 0d6d59d5c08..c5505caff3e 100644 --- a/src/cargo/core/compiler/future_incompat.rs +++ b/src/cargo/core/compiler/future_incompat.rs @@ -505,7 +505,7 @@ https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch current_reports.save_report(bcx.ws, suggestion_message.clone(), rendered_report); if should_display_message || bcx.build_config.future_incompat_report { - use annotate_snippets::*; + use cargo_util_terminal::report::*; let mut report = vec![Group::with_title(Level::WARNING.secondary_title(format!( "the following packages contain code that will be rejected by a future \ version of Rust: {}", diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index e38f2cd0471..c67a2085ff1 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -64,9 +64,9 @@ use std::ops::Range; use std::path::{Path, PathBuf}; use std::sync::{Arc, LazyLock}; -use annotate_snippets::{AnnotationKind, Group, Level, Renderer, Snippet}; use anyhow::{Context as _, Error}; use cargo_platform::{Cfg, Platform}; +use cargo_util_terminal::report::{AnnotationKind, Group, Level, Renderer, Snippet}; use itertools::Itertools; use regex::Regex; use tracing::{debug, instrument, trace}; @@ -2435,7 +2435,7 @@ impl ManifestErrorContext { .shell() .err_width() .diagnostic_terminal_width() - .unwrap_or(annotate_snippets::renderer::DEFAULT_TERM_WIDTH), + .unwrap_or(cargo_util_terminal::report::renderer::DEFAULT_TERM_WIDTH), } } diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 99f1d857ac0..98846e7cd63 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -21,8 +21,8 @@ use crate::sources::source::SourceMap; use crate::util::errors::CargoResult; use crate::util::interning::InternedString; use crate::util::{CanonicalUrl, GlobalContext}; -use annotate_snippets::Level; use anyhow::Context as _; +use cargo_util_terminal::report::Level; use itertools::Itertools; use tracing::{debug, trace}; use url::Url; diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index ae8a6b06968..4dfe2eccf4f 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -4,8 +4,8 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::path::{Path, PathBuf}; use std::rc::Rc; -use annotate_snippets::Level; use anyhow::{Context as _, anyhow, bail}; +use cargo_util_terminal::report::Level; use glob::glob; use itertools::Itertools; use tracing::debug; diff --git a/src/cargo/lints/mod.rs b/src/cargo/lints/mod.rs index 37986498a29..78ca6a49bf2 100644 --- a/src/cargo/lints/mod.rs +++ b/src/cargo/lints/mod.rs @@ -4,13 +4,13 @@ use std::fmt::Display; use std::ops::Range; use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::RustVersion; use cargo_util_schemas::manifest::TomlLintLevel; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Snippet; use pathdiff::diff_paths; use crate::core::Workspace; diff --git a/src/cargo/lints/rules/blanket_hint_mostly_unused.rs b/src/cargo/lints/rules/blanket_hint_mostly_unused.rs index 5c3bc9b9fa0..865542d159b 100644 --- a/src/cargo/lints/rules/blanket_hint_mostly_unused.rs +++ b/src/cargo/lints/rules/blanket_hint_mostly_unused.rs @@ -1,13 +1,13 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::ProfilePackageSpec; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/im_a_teapot.rs b/src/cargo/lints/rules/im_a_teapot.rs index 8760a43616e..863f05ff172 100644 --- a/src/cargo/lints/rules/im_a_teapot.rs +++ b/src/cargo/lints/rules/im_a_teapot.rs @@ -1,11 +1,11 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/implicit_minimum_version_req.rs b/src/cargo/lints/rules/implicit_minimum_version_req.rs index 87b795aa4ba..e5ba2d93e68 100644 --- a/src/cargo/lints/rules/implicit_minimum_version_req.rs +++ b/src/cargo/lints/rules/implicit_minimum_version_req.rs @@ -1,15 +1,15 @@ use std::collections::HashMap; use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_platform::Platform; use cargo_util_schemas::manifest::TomlDependency; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use toml::de::DeValue; use crate::CargoResult; diff --git a/src/cargo/lints/rules/missing_lints_inheritance.rs b/src/cargo/lints/rules/missing_lints_inheritance.rs index a77142e7324..b14832b67c0 100644 --- a/src/cargo/lints/rules/missing_lints_inheritance.rs +++ b/src/cargo/lints/rules/missing_lints_inheritance.rs @@ -1,11 +1,11 @@ use std::path::Path; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/non_kebab_case_bins.rs b/src/cargo/lints/rules/non_kebab_case_bins.rs index 8047986b39f..942baa2eed5 100644 --- a/src/cargo/lints/rules/non_kebab_case_bins.rs +++ b/src/cargo/lints/rules/non_kebab_case_bins.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/non_kebab_case_features.rs b/src/cargo/lints/rules/non_kebab_case_features.rs index 244c111fef0..3536d6b0667 100644 --- a/src/cargo/lints/rules/non_kebab_case_features.rs +++ b/src/cargo/lints/rules/non_kebab_case_features.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/non_kebab_case_packages.rs b/src/cargo/lints/rules/non_kebab_case_packages.rs index 73ce6485c97..b3c49f1eb93 100644 --- a/src/cargo/lints/rules/non_kebab_case_packages.rs +++ b/src/cargo/lints/rules/non_kebab_case_packages.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/non_snake_case_features.rs b/src/cargo/lints/rules/non_snake_case_features.rs index c2da1ae5f45..e2b74227813 100644 --- a/src/cargo/lints/rules/non_snake_case_features.rs +++ b/src/cargo/lints/rules/non_snake_case_features.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/non_snake_case_packages.rs b/src/cargo/lints/rules/non_snake_case_packages.rs index 350758f6620..fafc66f3cb8 100644 --- a/src/cargo/lints/rules/non_snake_case_packages.rs +++ b/src/cargo/lints/rules/non_snake_case_packages.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/redundant_homepage.rs b/src/cargo/lints/rules/redundant_homepage.rs index 850d7ab2467..b3be0f0a6cb 100644 --- a/src/cargo/lints/rules/redundant_homepage.rs +++ b/src/cargo/lints/rules/redundant_homepage.rs @@ -1,13 +1,13 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::InheritableField; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/redundant_readme.rs b/src/cargo/lints/rules/redundant_readme.rs index 8ed4e880fbf..74e369ddf1e 100644 --- a/src/cargo/lints/rules/redundant_readme.rs +++ b/src/cargo/lints/rules/redundant_readme.rs @@ -1,14 +1,14 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::InheritableField; use cargo_util_schemas::manifest::StringOrBool; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/unknown_lints.rs b/src/cargo/lints/rules/unknown_lints.rs index 37381df5720..a5c4c358793 100644 --- a/src/cargo/lints/rules/unknown_lints.rs +++ b/src/cargo/lints/rules/unknown_lints.rs @@ -1,9 +1,9 @@ -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Snippet; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/lints/rules/unused_workspace_dependencies.rs b/src/cargo/lints/rules/unused_workspace_dependencies.rs index 9680c93c59b..9fdd183b3e7 100644 --- a/src/cargo/lints/rules/unused_workspace_dependencies.rs +++ b/src/cargo/lints/rules/unused_workspace_dependencies.rs @@ -1,13 +1,13 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::InheritableDependency; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use indexmap::IndexSet; use crate::CargoResult; diff --git a/src/cargo/lints/rules/unused_workspace_package_fields.rs b/src/cargo/lints/rules/unused_workspace_package_fields.rs index 355ae98089f..b0411a24e55 100644 --- a/src/cargo/lints/rules/unused_workspace_package_fields.rs +++ b/src/cargo/lints/rules/unused_workspace_package_fields.rs @@ -1,12 +1,12 @@ use std::path::Path; -use annotate_snippets::AnnotationKind; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; -use annotate_snippets::Patch; -use annotate_snippets::Snippet; use cargo_util_schemas::manifest::TomlToolLints; +use cargo_util_terminal::report::AnnotationKind; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; +use cargo_util_terminal::report::Patch; +use cargo_util_terminal::report::Snippet; use indexmap::IndexSet; use crate::CargoResult; diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs index 71526a36069..c812bc1599f 100644 --- a/src/cargo/ops/cargo_clean.rs +++ b/src/cargo/ops/cargo_clean.rs @@ -7,9 +7,9 @@ use crate::util::edit_distance; use crate::util::errors::CargoResult; use crate::util::interning::InternedString; use crate::util::{GlobalContext, Progress, ProgressStyle}; -use annotate_snippets::Level; use anyhow::bail; use cargo_util::paths; +use cargo_util_terminal::report::Level; use indexmap::{IndexMap, IndexSet}; use std::ffi::OsString; diff --git a/src/cargo/ops/cargo_compile/mod.rs b/src/cargo/ops/cargo_compile/mod.rs index 64e81fdf3a4..49ac5ee530c 100644 --- a/src/cargo/ops/cargo_compile/mod.rs +++ b/src/cargo/ops/cargo_compile/mod.rs @@ -61,7 +61,7 @@ use crate::util::log_message::LogMessage; use crate::util::{CargoResult, StableHasher}; mod compile_filter; -use annotate_snippets::{Group, Level, Origin}; +use cargo_util_terminal::report::{Group, Level, Origin}; pub use compile_filter::{CompileFilter, FilterRule, LibRule}; pub(super) mod unit_generator; diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs index 9d0ff890b8d..1c92edc8c35 100644 --- a/src/cargo/ops/cargo_install.rs +++ b/src/cargo/ops/cargo_install.rs @@ -14,10 +14,10 @@ use crate::util::errors::CargoResult; use crate::util::{Filesystem, GlobalContext, Rustc}; use crate::{drop_println, ops}; -use annotate_snippets::Level; use anyhow::{Context as _, bail}; use cargo_util::paths; use cargo_util_schemas::core::PartialVersion; +use cargo_util_terminal::report::Level; use itertools::Itertools; use semver::VersionReq; use tempfile::Builder as TempFileBuilder; diff --git a/src/cargo/ops/cargo_package/mod.rs b/src/cargo/ops/cargo_package/mod.rs index 67e9cbc7a14..5d60e557dc7 100644 --- a/src/cargo/ops/cargo_package/mod.rs +++ b/src/cargo/ops/cargo_package/mod.rs @@ -30,11 +30,11 @@ use crate::util::errors::ManifestError; use crate::util::restricted_names; use crate::util::toml::prepare_for_publish; use crate::{drop_println, ops}; -use annotate_snippets::Level; use anyhow::{Context as _, bail}; use cargo_util::paths; use cargo_util_schemas::index::{IndexPackage, RegistryDependency}; use cargo_util_schemas::messages; +use cargo_util_terminal::report::Level; use cargo_util_terminal::{Shell, Verbosity}; use flate2::{Compression, GzBuilder}; use tar::{Builder, EntryType, Header, HeaderMode}; diff --git a/src/cargo/ops/cargo_package/vcs.rs b/src/cargo/ops/cargo_package/vcs.rs index 2056e1607f9..05aa4289843 100644 --- a/src/cargo/ops/cargo_package/vcs.rs +++ b/src/cargo/ops/cargo_package/vcs.rs @@ -5,9 +5,9 @@ use crate::ops::PackageOpts; use crate::sources::PathEntry; use crate::{CargoResult, GlobalContext}; -use annotate_snippets::Level; use anyhow::Context; use cargo_util::paths; +use cargo_util_terminal::report::Level; use gix::bstr::BString; use gix::bstr::ByteSlice; use gix::bstr::ByteVec; diff --git a/src/cargo/ops/cargo_report/rebuilds.rs b/src/cargo/ops/cargo_report/rebuilds.rs index fb30dcb85dc..e36498aa0cd 100644 --- a/src/cargo/ops/cargo_report/rebuilds.rs +++ b/src/cargo/ops/cargo_report/rebuilds.rs @@ -5,10 +5,10 @@ use std::fs::File; use std::io::BufReader; use std::path::Path; -use annotate_snippets::Group; -use annotate_snippets::Level; use anyhow::Context as _; use cargo_util_schemas::core::PackageIdSpec; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; use itertools::Itertools as _; use crate::AlreadyPrintedError; diff --git a/src/cargo/ops/cargo_report/sessions.rs b/src/cargo/ops/cargo_report/sessions.rs index b4d32f95699..c6d2ebfa08b 100644 --- a/src/cargo/ops/cargo_report/sessions.rs +++ b/src/cargo/ops/cargo_report/sessions.rs @@ -1,6 +1,6 @@ //! The `cargo report sessions` command. -use annotate_snippets::Level; +use cargo_util_terminal::report::Level; use crate::CargoResult; use crate::GlobalContext; diff --git a/src/cargo/ops/cargo_report/timings.rs b/src/cargo/ops/cargo_report/timings.rs index 60832d5c5c1..74f6e4efa9e 100644 --- a/src/cargo/ops/cargo_report/timings.rs +++ b/src/cargo/ops/cargo_report/timings.rs @@ -5,9 +5,9 @@ use std::fs::File; use std::io::BufReader; use std::path::PathBuf; -use annotate_snippets::Level; use anyhow::Context as _; use cargo_util::paths; +use cargo_util_terminal::report::Level; use indexmap::IndexMap; use indexmap::map::Entry; use itertools::Itertools as _; diff --git a/src/cargo/ops/common_for_install_and_uninstall.rs b/src/cargo/ops/common_for_install_and_uninstall.rs index 9eecf4fd1c3..75246bf3f0a 100644 --- a/src/cargo/ops/common_for_install_and_uninstall.rs +++ b/src/cargo/ops/common_for_install_and_uninstall.rs @@ -6,10 +6,10 @@ use std::path::{Path, PathBuf}; use std::rc::Rc; use std::task::Poll; -use annotate_snippets::Level; use anyhow::{Context as _, bail, format_err}; use cargo_util::paths; use cargo_util_schemas::core::PartialVersion; +use cargo_util_terminal::report::Level; use ops::FilterRule; use serde::{Deserialize, Serialize}; diff --git a/src/cargo/ops/registry/publish.rs b/src/cargo/ops/registry/publish.rs index ab8d0898828..2c520861e66 100644 --- a/src/cargo/ops/registry/publish.rs +++ b/src/cargo/ops/registry/publish.rs @@ -11,12 +11,12 @@ use std::io::Seek; use std::io::SeekFrom; use std::time::Duration; -use annotate_snippets::Level; use anyhow::Context as _; use anyhow::bail; use cargo_credential::Operation; use cargo_credential::Secret; use cargo_util::paths; +use cargo_util_terminal::report::Level; use crates_io::NewCrate; use crates_io::NewCrateDependency; use crates_io::Registry; @@ -298,12 +298,12 @@ pub fn publish(ws: &Workspace<'_>, opts: &PublishOpts<'_>) -> CargoResult<()> { let short_pkg_descriptions = package_list(to_confirm.iter().copied(), "or"); if plan.is_empty() { let report = &[ - annotate_snippets::Group::with_title( - annotate_snippets::Level::NOTE + cargo_util_terminal::report::Group::with_title( + cargo_util_terminal::report::Level::NOTE .secondary_title(format!( "waiting for {short_pkg_descriptions} to be available at {source_description}" ))), - annotate_snippets::Group::with_title(annotate_snippets::Level::HELP.secondary_title(format!( + cargo_util_terminal::report::Group::with_title(cargo_util_terminal::report::Level::HELP.secondary_title(format!( "you may press ctrl-c to skip waiting; the {crate} should be available shortly", crate = if to_confirm.len() == 1 { "crate" } else {"crates"} ))), diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs index 661dc05f1c0..f94d8f5afe1 100644 --- a/src/cargo/ops/resolve.rs +++ b/src/cargo/ops/resolve.rs @@ -78,11 +78,11 @@ use crate::util::CanonicalUrl; use crate::util::cache_lock::CacheLockMode; use crate::util::context::FeatureUnification; use crate::util::errors::CargoResult; -use annotate_snippets::Group; -use annotate_snippets::Level; use anyhow::Context as _; use cargo_util::paths; use cargo_util_schemas::core::PartialVersion; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; use std::borrow::Cow; use std::collections::{HashMap, HashSet}; use std::rc::Rc; diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index 04d4ec304a5..2da4c7ec351 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -191,9 +191,9 @@ use std::io::Write; use std::path::{Path, PathBuf}; use std::task::{Poll, ready}; -use annotate_snippets::Level; use anyhow::Context as _; use cargo_util::paths::{self, exclude_from_backups_and_indexing}; +use cargo_util_terminal::report::Level; use flate2::read::GzDecoder; use serde::Deserialize; use serde::Serialize; diff --git a/src/cargo/util/context/mod.rs b/src/cargo/util/context/mod.rs index fc6e6c33546..d0287e94a41 100644 --- a/src/cargo/util/context/mod.rs +++ b/src/cargo/util/context/mod.rs @@ -91,11 +91,11 @@ use crate::util::restricted_names::is_glob_pattern; use crate::util::{CanonicalUrl, closest_msg, internal}; use crate::util::{Filesystem, IntoUrl, IntoUrlWithBase, Rustc}; -use annotate_snippets::Level; use anyhow::{Context as _, anyhow, bail, format_err}; use cargo_credential::Secret; use cargo_util::paths; use cargo_util_schemas::manifest::RegistryName; +use cargo_util_terminal::report::Level; use cargo_util_terminal::{Shell, Verbosity}; use curl::easy::Easy; use itertools::Itertools; diff --git a/src/cargo/util/diagnostic_server.rs b/src/cargo/util/diagnostic_server.rs index 4f65af6a264..84e3cc45608 100644 --- a/src/cargo/util/diagnostic_server.rs +++ b/src/cargo/util/diagnostic_server.rs @@ -9,11 +9,11 @@ use std::sync::Arc; use std::sync::atomic::{AtomicBool, Ordering}; use std::thread::{self, JoinHandle}; -use annotate_snippets::Group; -use annotate_snippets::Level; -use annotate_snippets::Origin; use anyhow::{Context as _, Error}; use cargo_util::ProcessBuilder; +use cargo_util_terminal::report::Group; +use cargo_util_terminal::report::Level; +use cargo_util_terminal::report::Origin; use serde::{Deserialize, Serialize}; use tracing::warn; diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index a1be7b0aa46..c93bb14a9fd 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -1,4 +1,4 @@ -use annotate_snippets::{AnnotationKind, Group, Level, Snippet}; +use cargo_util_terminal::report::{AnnotationKind, Group, Level, Snippet}; use std::borrow::Cow; use std::cell::OnceCell; use std::collections::{BTreeMap, BTreeSet, HashMap}; diff --git a/tests/testsuite/lockfile_path.rs b/tests/testsuite/lockfile_path.rs index 42b15d732a2..3d15fda9503 100644 --- a/tests/testsuite/lockfile_path.rs +++ b/tests/testsuite/lockfile_path.rs @@ -2,12 +2,11 @@ use std::fs; -use snapbox::str; - use crate::prelude::*; use cargo_test_support::compare::assert_e2e; use cargo_test_support::install::assert_has_installed_exe; use cargo_test_support::registry::{Package, RegistryBuilder}; +use cargo_test_support::str; use cargo_test_support::{ ProjectBuilder, basic_bin_manifest, cargo_test, paths, project, symlink_supported, }; diff --git a/tests/testsuite/pkgid.rs b/tests/testsuite/pkgid.rs index 5d2ee9938d4..f3d30cd1c5f 100644 --- a/tests/testsuite/pkgid.rs +++ b/tests/testsuite/pkgid.rs @@ -419,7 +419,7 @@ fn pkgid_json_message_metadata_consistency() { let output = std::fs::read_to_string(&path).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { diff --git a/tests/testsuite/sbom.rs b/tests/testsuite/sbom.rs index a772b44ee35..c3aef615a31 100644 --- a/tests/testsuite/sbom.rs +++ b/tests/testsuite/sbom.rs @@ -33,7 +33,7 @@ fn warn_without_passing_unstable_flag() { p.cargo("run") .env("CARGO_BUILD_SBOM", "true") .masquerade_as_nightly_cargo(&["sbom"]) - .with_stderr_data(snapbox::str![[r#" + .with_stderr_data(cargo_test_support::str![[r#" [WARNING] ignoring 'sbom' config, pass `-Zsbom` to enable it [COMPILING] foo v0.5.0 ([ROOT]/foo) [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -65,7 +65,7 @@ fn simple() { // but other tests omit them for brevity. assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -129,7 +129,7 @@ fn with_multiple_crate_types() { let output = std::fs::read_to_string(sbom_path).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -185,7 +185,7 @@ fn with_simple_build_script() { let output = std::fs::read_to_string(path).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -271,7 +271,7 @@ fn with_build_dependencies() { let output = std::fs::read_to_string(path).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -397,7 +397,7 @@ fn crate_uses_different_features_for_build_and_normal_dependencies() { let output = std::fs::read_to_string(path).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -502,7 +502,7 @@ fn artifact_dep() { let output = std::fs::read_to_string(append_sbom_suffix(&p.dylib("foo"))).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -617,7 +617,7 @@ fn proc_macro() { let output = std::fs::read_to_string(append_sbom_suffix(&p.bin("foo"))).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ { @@ -685,7 +685,7 @@ fn workspace_wrapper() { .env("CARGO_BUILD_SBOM", "true") .env("RUSTC_WRAPPER", wrapper.bin("wrapper")) .masquerade_as_nightly_cargo(&["sbom"]) - .with_stderr_data(snapbox::str![[r#" + .with_stderr_data(cargo_test_support::str![[r#" [COMPILING] foo v0.5.0 ([ROOT]/foo) found sbom [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s @@ -697,7 +697,7 @@ found sbom let output = std::fs::read_to_string(file).unwrap(); assert_e2e().eq( output, - snapbox::str![[r#" + cargo_test_support::str![[r#" { "crates": [ {