refactor: Export public dependencies from internal crates

Cargo.toml

@@ -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

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;

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;

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;

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;

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;

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: {}",

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),
         }
     }
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;