diff options
| -rw-r--r-- | components/devtools/lib.rs | 7 | ||||
| -rw-r--r-- | components/devtools_traits/lib.rs | 9 | ||||
| -rw-r--r-- | components/script/dom/console.rs | 7 |
3 files changed, 18 insertions, 5 deletions
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 1e51abaaa86..71fa0b0a614 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -252,7 +252,12 @@ fn run_server(sender: Sender<DevtoolsControlMsg>, let actors = actors.lock().unwrap(); let console_actor = actors.find::<ConsoleActor>(&console_actor_name); match console_message { - ConsoleMessage::LogMessage(message, filename, lineNumber, columnNumber) => { + ConsoleMessage::LogMessage { + message, + filename, + lineNumber, + columnNumber, + } => { let msg = ConsoleAPICall { from: console_actor.name.clone(), __type__: "consoleAPICall".to_string(), diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 54411122271..22f22e82836 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -148,9 +148,12 @@ impl Decodable for Modification { //TODO: Include options for Warn, Debug, Info, Error messages from Console #[derive(Clone)] pub enum ConsoleMessage { - // Log: message, filename, line number, column number - LogMessage(String, String, u32, u32), - //WarnMessage(String), + LogMessage { + message: String, + filename: String, + lineNumber: u32, + columnNumber: u32, + }, } #[derive(Clone)] diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index fd213190e24..0ef57f026b5 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -37,7 +37,12 @@ impl<'a> ConsoleMethods for JSRef<'a, Console> { for message in messages { println!("{}", message); //TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later - propagate_console_msg(&self, ConsoleMessage::LogMessage(message, String::from_str("test"), 1, 1)); + propagate_console_msg(&self, ConsoleMessage::LogMessage { + message: message, + filename: "test".to_owned(), + lineNumber: 1, + columnNumber: 1, + }); } } |