From 4784564d5c778e42d9dcf9431285a07de3ff04f2 Mon Sep 17 00:00:00 2001
From: s-maurice <51819025+s-maurice@users.noreply.github.com>
Date: Sun, 6 Mar 2022 01:43:46 +0100
Subject: [PATCH] move servo_version from config crate to
 ports/libsimpleservo/api/src/lib.rs and duplicate in ports/winit/main2.rs

Signed-off-by: s-maurice <51819025+s-maurice@users.noreply.github.com>
---
 components/config/lib.rs            |  9 ---------
 ports/libsimpleservo/api/src/lib.rs |  7 ++++++-
 ports/winit/main2.rs                | 10 +++++++++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/components/config/lib.rs b/components/config/lib.rs
index 47bef2f0c3e..0da6c32f0e6 100644
--- a/components/config/lib.rs
+++ b/components/config/lib.rs
@@ -18,12 +18,3 @@ pub mod prefs;
 pub mod basedir;
 #[allow(unsafe_code)]
 pub mod opts;
-
-pub fn servo_version() -> String {
-    let cargo_version = env!("CARGO_PKG_VERSION");
-    let git_info = option_env!("GIT_INFO");
-    match git_info {
-        Some(info) => format!("Servo {}{}", cargo_version, info),
-        None => format!("Servo {}", cargo_version),
-    }
-}
diff --git a/ports/libsimpleservo/api/src/lib.rs b/ports/libsimpleservo/api/src/lib.rs
index 7fade0fcf28..7f4950d099b 100644
--- a/ports/libsimpleservo/api/src/lib.rs
+++ b/ports/libsimpleservo/api/src/lib.rs
@@ -185,7 +185,12 @@ pub struct ServoGlue {
 }
 
 pub fn servo_version() -> String {
-    servo::config::servo_version()
+    let cargo_version = env!("CARGO_PKG_VERSION");
+    let git_info = option_env!("GIT_INFO");
+    match git_info {
+        Some(info) => format!("Servo {}{}", cargo_version, info),
+        None => format!("Servo {}", cargo_version),
+    }
 }
 
 /// Test if a url is valid.
diff --git a/ports/winit/main2.rs b/ports/winit/main2.rs
index 77e2c18bd0a..63560f832e1 100644
--- a/ports/winit/main2.rs
+++ b/ports/winit/main2.rs
@@ -26,7 +26,6 @@ mod window_trait;
 use app::App;
 use getopts::Options;
 use servo::config::opts::{self, ArgumentParsingResult};
-use servo::config::servo_version;
 use servo::servo_config::pref;
 use std::env;
 use std::io::Write;
@@ -163,3 +162,12 @@ pub fn main() {
 
     platform::deinit(clean_shutdown)
 }
+
+pub fn servo_version() -> String {
+    let cargo_version = env!("CARGO_PKG_VERSION");
+    let git_info = option_env!("GIT_INFO");
+    match git_info {
+        Some(info) => format!("Servo {}{}", cargo_version, info),
+        None => format!("Servo {}", cargo_version),
+    }
+}