diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-19 17:47:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 17:47:27 -0400 |
commit | df2adebefdfa3da49f173e480fa1e56450f9bda2 (patch) | |
tree | 1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/console.rs | |
parent | 2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff) | |
parent | c37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff) | |
download | servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip |
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format code only.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21737)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/console.rs')
-rw-r--r-- | components/script/dom/console.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 7aa99c2fab6..410477a79d3 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -16,13 +16,14 @@ impl Console { fn send_to_devtools(global: &GlobalScope, level: LogLevel, message: DOMString) { if let Some(chan) = global.devtools_chan() { let console_message = prepare_message(level, message); - let worker_id = global.downcast::<WorkerGlobalScope>().map(|worker| { - worker.get_worker_id() - }); + let worker_id = global + .downcast::<WorkerGlobalScope>() + .map(|worker| worker.get_worker_id()); let devtools_message = ScriptToDevtoolsControlMsg::ConsoleAPI( global.pipeline_id(), console_message, - worker_id); + worker_id, + ); chan.send(devtools_message).unwrap(); } } @@ -33,7 +34,10 @@ impl Console { // we're finished with stdout. Since the stderr lock is reentrant, there is // no risk of deadlock if the callback ends up trying to write to stderr for // any reason. -fn with_stderr_lock<F>(f: F) where F: FnOnce() { +fn with_stderr_lock<F>(f: F) +where + F: FnOnce(), +{ let stderr = io::stderr(); let _handle = stderr.lock(); f() @@ -116,9 +120,7 @@ impl Console { pub fn TimeEnd(global: &GlobalScope, label: DOMString) { with_stderr_lock(move || { if let Ok(delta) = global.time_end(&label) { - let message = DOMString::from( - format!("{}: {}ms", label, delta) - ); + let message = DOMString::from(format!("{}: {}ms", label, delta)); println!("{}", message); Self::send_to_devtools(global, LogLevel::Log, message); }; |