Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

[script/textinput] Fix warning: unreachable pattern

Browse source 
The `cfg` attribute in use resulted in two match arms for two cases on
`macos`. Since both arms had a main functionality in common, I merged
them and conditions the extra `macos` part.

```
warning: unreachable pattern
   -->
/Users/behnam/code/servo/servo/components/script/textinput.rs:696:13
    |
696 |             (None, Key::Home) => {
    |             ^^^^^^^^^^^^^^^^^
    |
    = note: #[warn(unreachable_patterns)] on by default

warning: unreachable pattern
   -->
/Users/behnam/code/servo/servo/components/script/textinput.rs:700:13
    |
700 |             (None, Key::End) => {
    |             ^^^^^^^^^^^^^^^^
    |
    = note: #[warn(unreachable_patterns)] on by default
```
This commit is contained in:
Behnam Esfahbod 2017-05-24 01:16:19 -05:00
parent f3a694a7b4
commit 4df0ad2bc5
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/textinput.rs
View file

@ -632,14 +632,6 @@ impl<T: ClipboardProvider> TextInput<T> {
self.insert_char(c);
KeyReaction::DispatchInput
},
#[cfg(target_os = "macos")]
(None, Key::Home) => {
KeyReaction::RedrawSelection
},
#[cfg(target_os = "macos")]
(None, Key::End) => {
KeyReaction::RedrawSelection
},
(None, Key::Delete) => {
self.delete_char(Direction::Forward);
KeyReaction::DispatchInput
@ -694,12 +686,18 @@ impl<T: ClipboardProvider> TextInput<T> {
},
(None, Key::Enter) | (None, Key::KpEnter) => self.handle_return(),
(None, Key::Home) => {
self.edit_point.index = 0;
#[cfg(not(target_os = "macos"))]
{
self.edit_point.index = 0;
}
KeyReaction::RedrawSelection
},
(None, Key::End) => {
self.edit_point.index = self.current_line_length();
self.assert_ok_selection();
#[cfg(not(target_os = "macos"))]
{
self.edit_point.index = self.current_line_length();
self.assert_ok_selection();
}
KeyReaction::RedrawSelection
},
(None, Key::PageUp) => {