Auto merge of #12136 - ConnorGBrewster:servo_version_reporter, r=asajeffrey

bors-servo · web-flow · commit ac8020498e10 · 2016-07-02T09:05:04.000-07:00
Send servo version in mozbrowser error.  Adds support for sending a version string to b.html so we can put the servo version in the auto generated issue reports. r? @asajeffrey ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #12083 (github issue number if applicable).  - [ ] There are tests for these changes OR - [X] These changes do not require tests because sending servo version on mozbrwosererror for issue reporter.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12136)
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
@@ -49,6 +49,7 @@ use style::attr::{AttrValue, LengthOrPercentageOrAuto};
 use style::context::ReflowGoal;
 use url::Url;
 use util::prefs::mozbrowser_enabled;
+use util::servo_version;
 
 bitflags! {
     #[derive(JSTraceable, HeapSizeOf)]
@@ -360,6 +361,7 @@ impl MozBrowserEventDetailBuilder for HTMLIFrameElement {
                     type_: Some(DOMString::from(error_type.name())),
                     description: description.map(DOMString::from),
                     report: report.map(DOMString::from),
+                    version: Some(DOMString::from_string(servo_version().into())),
                 }.to_jsval(cx, rval);
             },
             MozBrowserEvent::SecurityChange(https_state) => {
diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl
@@ -61,6 +61,7 @@ dictionary BrowserElementErrorEventDetail {
   DOMString type;
   DOMString description;
   DOMString report;
+  DOMString version;
 };
 
 dictionary BrowserElementLocationChangeEventDetail {
diff --git a/components/servo/main.rs b/components/servo/main.rs
@@ -40,6 +40,7 @@ use servo::Browser;
 use servo::compositing::windowing::WindowEvent;
 use servo::util::opts::{self, ArgumentParsingResult};
 use servo::util::panicking::initiate_panic_hook;
+use servo::util::servo_version;
 use std::process;
 use std::rc::Rc;
 
@@ -104,7 +105,7 @@ fn main() {
     }
 
     if opts::get().is_printing_version {
-        println!("Servo {}{}", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"));
+        println!("{}", servo_version());
         process::exit(0);
     }
 
diff --git a/components/util/lib.rs b/components/util/lib.rs
@@ -64,3 +64,7 @@ pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool {
     let b: &T = &**b;
     (a as *const T) == (b as *const T)
 }
+
+pub fn servo_version() -> &'static str {
+    concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"))
+}

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ use servo::Browser;`
`40`	`40`	`use servo::compositing::windowing::WindowEvent;`
`41`	`41`	`use servo::util::opts::{self, ArgumentParsingResult};`
`42`	`42`	`use servo::util::panicking::initiate_panic_hook;`
	`43`	`+use servo::util::servo_version;`
`43`	`44`	`use std::process;`
`44`	`45`	`use std::rc::Rc;`
`45`	`46`
`@@ -104,7 +105,7 @@ fn main() {`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`if opts::get().is_printing_version {`
`107`		`- println!("Servo {}{}", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"));`
	`108`	`+ println!("{}", servo_version());`
`108`	`109`	`process::exit(0);`
`109`	`110`	`}`
`110`	`111`
Original file line number	Diff line number	Diff line change
`@@ -64,3 +64,7 @@ pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool {`
`64`	`64`	`let b: &T = &**b;`
`65`	`65`	`(a as const T) == (b as const T)`
`66`	`66`	`}`
	`67`	`+`
	`68`	`+pub fn servo_version() -> &'static str {`
	`69`	`+ concat!("Servo ", env!("CARGO_PKG_VERSION"), env!("GIT_INFO"))`
	`70`	`+}`