Use a struct variant for clarity

This commit is contained in:
Tamir Duberstein 2015-05-23 16:19:03 -04:00
parent 7561f7b83f
commit dce048dd54
3 changed files with 18 additions and 5 deletions

View file

@ -252,7 +252,12 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
let actors = actors.lock().unwrap(); let actors = actors.lock().unwrap();
let console_actor = actors.find::<ConsoleActor>(&console_actor_name); let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
match console_message { match console_message {
ConsoleMessage::LogMessage(message, filename, lineNumber, columnNumber) => { ConsoleMessage::LogMessage {
message,
filename,
lineNumber,
columnNumber,
} => {
let msg = ConsoleAPICall { let msg = ConsoleAPICall {
from: console_actor.name.clone(), from: console_actor.name.clone(),
__type__: "consoleAPICall".to_string(), __type__: "consoleAPICall".to_string(),

View file

@ -148,9 +148,12 @@ impl Decodable for Modification {
//TODO: Include options for Warn, Debug, Info, Error messages from Console //TODO: Include options for Warn, Debug, Info, Error messages from Console
#[derive(Clone)] #[derive(Clone)]
pub enum ConsoleMessage { pub enum ConsoleMessage {
// Log: message, filename, line number, column number LogMessage {
LogMessage(String, String, u32, u32), message: String,
//WarnMessage(String), filename: String,
lineNumber: u32,
columnNumber: u32,
},
} }
#[derive(Clone)] #[derive(Clone)]

View file

@ -37,7 +37,12 @@ impl<'a> ConsoleMethods for JSRef<'a, Console> {
for message in messages { for message in messages {
println!("{}", message); println!("{}", message);
//TODO: Sending fake values for filename, lineNumber and columnNumber in LogMessage; adjust later //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,
});
} }
} }