Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

move servo_version from config crate to ports/libsimpleservo/api/src/lib.rs and duplicate in ports/winit/main2.rs

Browse source 
Signed-off-by: s-maurice <51819025+s-maurice@users.noreply.github.com>
This commit is contained in:
s-maurice 2022-03-06 01:43:46 +01:00
parent d551e63b29
commit 4784564d5c
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/config/lib.rs
View file

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

7
ports/libsimpleservo/api/src/lib.rs
View file

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

10
ports/winit/main2.rs
View file

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