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

Tighten up checks for spaces around colons to deal with trait inheritance syntax.

Browse source
This commit is contained in:
Josh Matthews 2015-08-13 19:17:59 -04:00
parent 8bb853f643
commit a147cbe0c1
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/util/vec.rs
View file

@ -39,8 +39,8 @@ impl<T> FullBinarySearchMethods<T> for [T] {
return None; return None;
} }
let mut low : isize = 0; let mut low: isize = 0;
let mut high : isize = (self.len() as isize) - 1; let mut high: isize = (self.len() as isize) - 1;
while low <= high { while low <= high {
// http://googleresearch.blogspot.com/2006/06/extra-extra-read-all-about-it-nearly.html // http://googleresearch.blogspot.com/2006/06/extra-extra-read-all-about-it-nearly.html

10
ports/glutin/window.rs
View file

@ -58,19 +58,19 @@ bitflags! {
// Some shortcuts use Cmd on Mac and Control on other systems. // Some shortcuts use Cmd on Mac and Control on other systems.
#[cfg(all(feature = "window", target_os="macos"))] #[cfg(all(feature = "window", target_os="macos"))]
const CMD_OR_CONTROL : constellation_msg::KeyModifiers = SUPER; const CMD_OR_CONTROL: constellation_msg::KeyModifiers = SUPER;
#[cfg(all(feature = "window", not(target_os="macos")))] #[cfg(all(feature = "window", not(target_os="macos")))]
const CMD_OR_CONTROL : constellation_msg::KeyModifiers = CONTROL; const CMD_OR_CONTROL: constellation_msg::KeyModifiers = CONTROL;
// Some shortcuts use Cmd on Mac and Alt on other systems. // Some shortcuts use Cmd on Mac and Alt on other systems.
#[cfg(all(feature = "window", target_os="macos"))] #[cfg(all(feature = "window", target_os="macos"))]
const CMD_OR_ALT : constellation_msg::KeyModifiers = SUPER; const CMD_OR_ALT: constellation_msg::KeyModifiers = SUPER;
#[cfg(all(feature = "window", not(target_os="macos")))] #[cfg(all(feature = "window", not(target_os="macos")))]
const CMD_OR_ALT : constellation_msg::KeyModifiers = ALT; const CMD_OR_ALT: constellation_msg::KeyModifiers = ALT;
// This should vary by zoom level and maybe actual text size (focused or under cursor) // This should vary by zoom level and maybe actual text size (focused or under cursor)
#[cfg(feature = "window")] #[cfg(feature = "window")]
const LINE_HEIGHT : f32 = 38.0; const LINE_HEIGHT: f32 = 38.0;
/// The type of a window. /// The type of a window.
#[cfg(feature = "window")] #[cfg(feature = "window")]

8
python/tidy.py
View file

@ -232,9 +232,11 @@ def check_rust(file_name, contents):
if match: if match:
yield (idx + 1, "missing space after ->") yield (idx + 1, "missing space after ->")
# Avoid flagging ::crate::mod # Avoid flagging ::crate::mod and `trait Foo : Bar`
if line.find(" :[^:]") != -1: match = line.find(" :")
yield (idx + 1, "extra space before :") if match != -1:
if line[0:match].find('trait ') == -1 and line[match + 2] != ':':
yield (idx + 1, "extra space before :")
# Avoid flagging crate::mod # Avoid flagging crate::mod
match = re.search(r"[^:]:[A-Za-z]", line) match = re.search(r"[^:]:[A-Za-z]", line)