summaryrefslogtreecommitdiff
path: root/cli/tools
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools')
-rw-r--r--cli/tools/bench/mod.rs1
-rw-r--r--cli/tools/bench/reporters.rs10
-rw-r--r--cli/tools/jupyter/server.rs4
-rw-r--r--cli/tools/repl/mod.rs2
-rw-r--r--cli/tools/upgrade.rs74
5 files changed, 56 insertions, 35 deletions
diff --git a/cli/tools/bench/mod.rs b/cli/tools/bench/mod.rs
index 9cf222c45..44ae8321d 100644
--- a/cli/tools/bench/mod.rs
+++ b/cli/tools/bench/mod.rs
@@ -13,7 +13,6 @@ use crate::util::file_watcher;
use crate::util::fs::collect_specifiers;
use crate::util::path::is_script_ext;
use crate::util::path::matches_pattern_or_exact_path;
-use crate::version::get_user_agent;
use crate::worker::CliMainWorkerFactory;
use deno_config::glob::WalkEntry;
diff --git a/cli/tools/bench/reporters.rs b/cli/tools/bench/reporters.rs
index 690373dc8..9a1da04ec 100644
--- a/cli/tools/bench/reporters.rs
+++ b/cli/tools/bench/reporters.rs
@@ -2,6 +2,8 @@
use serde::Serialize;
+use crate::version;
+
use super::*;
pub trait BenchReporter {
@@ -25,7 +27,11 @@ struct JsonReporterOutput {
impl Default for JsonReporterOutput {
fn default() -> Self {
Self {
- runtime: format!("{} {}", get_user_agent(), env!("TARGET")),
+ runtime: format!(
+ "{} {}",
+ version::DENO_VERSION_INFO.user_agent,
+ env!("TARGET")
+ ),
cpu: mitata::cpu::name(),
benches: vec![],
}
@@ -150,7 +156,7 @@ impl BenchReporter for ConsoleReporter {
"{}\n",
colors::gray(format!(
"runtime: deno {} ({})",
- crate::version::deno(),
+ crate::version::DENO_VERSION_INFO.deno,
env!("TARGET")
))
);
diff --git a/cli/tools/jupyter/server.rs b/cli/tools/jupyter/server.rs
index 42e341f21..bcfc52212 100644
--- a/cli/tools/jupyter/server.rs
+++ b/cli/tools/jupyter/server.rs
@@ -670,10 +670,10 @@ fn kernel_info() -> messaging::KernelInfoReply {
status: ReplyStatus::Ok,
protocol_version: "5.3".to_string(),
implementation: "Deno kernel".to_string(),
- implementation_version: crate::version::deno().to_string(),
+ implementation_version: crate::version::DENO_VERSION_INFO.deno.to_string(),
language_info: messaging::LanguageInfo {
name: "typescript".to_string(),
- version: crate::version::TYPESCRIPT.to_string(),
+ version: crate::version::DENO_VERSION_INFO.typescript.to_string(),
mimetype: "text/x.typescript".to_string(),
file_extension: ".ts".to_string(),
pygments_lexer: "typescript".to_string(),
diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs
index 9798a6967..d754b4dd2 100644
--- a/cli/tools/repl/mod.rs
+++ b/cli/tools/repl/mod.rs
@@ -242,7 +242,7 @@ pub async fn run(
// Doing this manually, instead of using `log::info!` because these messages
// are supposed to go to stdout, not stderr.
if !cli_options.is_quiet() {
- println!("Deno {}", crate::version::deno());
+ println!("Deno {}", crate::version::DENO_VERSION_INFO.deno);
println!("exit using ctrl+d, ctrl+c, or close()");
if repl_flags.is_default_command {
println!(
diff --git a/cli/tools/upgrade.rs b/cli/tools/upgrade.rs
index 01239964c..bd194554d 100644
--- a/cli/tools/upgrade.rs
+++ b/cli/tools/upgrade.rs
@@ -140,7 +140,7 @@ impl VersionProvider for RealVersionProvider {
}
fn current_version(&self) -> Cow<str> {
- Cow::Borrowed(version::release_version_or_canary_commit_hash())
+ Cow::Borrowed(version::DENO_VERSION_INFO.version_or_git_hash())
}
// TODO(bartlomieju): update to handle `Lts` channel
@@ -148,7 +148,10 @@ impl VersionProvider for RealVersionProvider {
&self,
) -> Result<ReleaseChannel, AnyError> {
// TODO(bartlomieju): remove hitting a remote server
- if matches!(version::RELEASE_CHANNEL, ReleaseChannel::Canary) {
+ if matches!(
+ version::DENO_VERSION_INFO.release_channel,
+ ReleaseChannel::Canary
+ ) {
// If this fails for whatever reason, just return an empty vector.
// It's better to miss that than throw error here.
let rc_versions = get_rc_versions(
@@ -160,7 +163,7 @@ impl VersionProvider for RealVersionProvider {
let is_current_exe_an_rc = rc_versions
.iter()
- .any(|(hash, _)| hash == version::GIT_COMMIT_HASH);
+ .any(|(hash, _)| hash == version::DENO_VERSION_INFO.git_hash);
if is_current_exe_an_rc {
Ok(ReleaseChannel::Rc)
@@ -338,7 +341,7 @@ pub fn check_for_upgrades(
log::info!(
"{} {} → {} {}",
colors::green("A new release of Deno is available:"),
- colors::cyan(version::deno()),
+ colors::cyan(version::DENO_VERSION_INFO.deno),
colors::cyan(&upgrade_version),
colors::italic_gray("Run `deno upgrade` to install it.")
);
@@ -546,7 +549,7 @@ pub async fn upgrade(
log::info!("Upgraded successfully (dry run)");
if !requested_version.is_canary() {
print_release_notes(
- version::deno(),
+ version::DENO_VERSION_INFO.deno,
&selected_version_to_upgrade.version_or_hash,
);
}
@@ -569,7 +572,10 @@ pub async fn upgrade(
colors::green(selected_version_to_upgrade.display())
);
if !requested_version.is_canary() {
- print_release_notes(version::deno(), &selected_version_to_upgrade.display);
+ print_release_notes(
+ version::DENO_VERSION_INFO.deno,
+ &selected_version_to_upgrade.display,
+ );
}
drop(temp_dir); // delete the temp dir
@@ -638,15 +644,20 @@ fn select_specific_version_for_upgrade(
) -> Result<Option<AvailableVersion>, AnyError> {
match release_channel {
ReleaseChannel::Stable => {
- let current_is_passed =
- if !matches!(version::RELEASE_CHANNEL, ReleaseChannel::Canary) {
- version::deno() == version
- } else {
- false
- };
+ let current_is_passed = if !matches!(
+ version::DENO_VERSION_INFO.release_channel,
+ ReleaseChannel::Canary
+ ) {
+ version::DENO_VERSION_INFO.deno == version
+ } else {
+ false
+ };
if !force && current_is_passed {
- log::info!("Version {} is already installed", version::deno());
+ log::info!(
+ "Version {} is already installed",
+ version::DENO_VERSION_INFO.deno
+ );
return Ok(None);
}
@@ -657,9 +668,12 @@ fn select_specific_version_for_upgrade(
}))
}
ReleaseChannel::Canary => {
- let current_is_passed = version::GIT_COMMIT_HASH == version;
+ let current_is_passed = version::DENO_VERSION_INFO.git_hash == version;
if !force && current_is_passed {
- log::info!("Version {} is already installed", version::deno());
+ log::info!(
+ "Version {} is already installed",
+ version::DENO_VERSION_INFO.deno
+ );
return Ok(None);
}
@@ -693,17 +707,19 @@ async fn find_latest_version_to_upgrade(
let (maybe_newer_latest_version, current_version) = match release_channel {
ReleaseChannel::Stable => {
- let current_version = version::deno();
- let current_is_most_recent =
- if !matches!(version::RELEASE_CHANNEL, ReleaseChannel::Canary) {
- let current = Version::parse_standard(current_version).unwrap();
- let latest =
- Version::parse_standard(&latest_version_found.version_or_hash)
- .unwrap();
- current >= latest
- } else {
- false
- };
+ let current_version = version::DENO_VERSION_INFO.deno;
+ let current_is_most_recent = if !matches!(
+ version::DENO_VERSION_INFO.release_channel,
+ ReleaseChannel::Canary
+ ) {
+ let current = Version::parse_standard(current_version).unwrap();
+ let latest =
+ Version::parse_standard(&latest_version_found.version_or_hash)
+ .unwrap();
+ current >= latest
+ } else {
+ false
+ };
if !force && current_is_most_recent {
(None, current_version)
@@ -712,7 +728,7 @@ async fn find_latest_version_to_upgrade(
}
}
ReleaseChannel::Canary => {
- let current_version = version::GIT_COMMIT_HASH;
+ let current_version = version::DENO_VERSION_INFO.git_hash;
let current_is_most_recent =
current_version == latest_version_found.version_or_hash;
@@ -723,7 +739,7 @@ async fn find_latest_version_to_upgrade(
}
}
ReleaseChannel::Rc => {
- let current_version = version::GIT_COMMIT_HASH;
+ let current_version = version::DENO_VERSION_INFO.git_hash;
let current_is_most_recent =
current_version == latest_version_found.version_or_hash;
@@ -1054,7 +1070,7 @@ impl CheckVersionFile {
self.last_checked.to_rfc3339(),
self.latest_version,
self.current_version,
- self.current_release_channel.serialize(),
+ self.current_release_channel.serialize()
)
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 07:18:52 +0000