aboutsummaryrefslogtreecommitdiffstats
path: root/components/webdriver_server/keys.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-10-19 10:35:08 -0500
committerGitHub <noreply@github.com>2017-10-19 10:35:08 -0500
commitfe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b (patch)
tree84fe331eb4af20575050134b234b6c99a252726d /components/webdriver_server/keys.rs
parent07e9794306d597afe5d90d192fd32a99572c3cc3 (diff)
parente8e2d0a4b24475b018dbc7e59ea46fdceaf20815 (diff)
downloadservo-fe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b.tar.gz
servo-fe16c1d5c3c9084da0ccb85af599d6ec0f8ab20b.zip
Auto merge of #18809 - Eijebong:bitflags, r=nox
Update bitflags to 1.0 in every servo crate It still needs dependencies update to remove all the other bitflags versions. - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because it's a dependency update <!-- 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/18809) <!-- Reviewable:end -->
Diffstat (limited to 'components/webdriver_server/keys.rs')
-rw-r--r--components/webdriver_server/keys.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/webdriver_server/keys.rs b/components/webdriver_server/keys.rs
index ce516411c75..b52febc2b5e 100644
--- a/components/webdriver_server/keys.rs
+++ b/components/webdriver_server/keys.rs
@@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-use msg::constellation_msg::{Key, KeyState, KeyModifiers, SHIFT};
+use msg::constellation_msg::{Key, KeyState, KeyModifiers};
/// Takes a character and returns an Option containing a tuple of the
@@ -174,7 +174,7 @@ pub fn keycodes_to_keys(key_codes: &[char]) -> Result<Vec<(Key, KeyModifiers, Ke
for char_code in key_codes.iter() {
let (key, with_shift) = key_from_char(char_code).ok_or(format!("Unsupported character code {}", char_code))?;
let modifiers = if with_shift {
- SHIFT
+ KeyModifiers::SHIFT
} else {
KeyModifiers::empty()
};