Merge #32

bors[bot] · Amanieu · bors[bot] · commit b1e9c276d5b9 · 2018-11-27T16:57:38.000Z
32: Fix non-SSE variant of convert_special_to_empty_and_full_to_deleted r=Amanieu a=Amanieu

As a bonus, it is now faster too!

Co-authored-by: Amanieu d'Antras &lt;amanieu@gmail.com&gt;
diff --git a/src/raw/generic.rs b/src/raw/generic.rs
@@ -122,6 +122,7 @@ impl Group {
     /// - `FULL => DELETED`
     #[inline]
     pub fn convert_special_to_empty_and_full_to_deleted(&self) -> Group {
-        Group(((self.0 & repeat(0x80)) >> 7) * 0xff)
+        let special = self.0 & repeat(0x80);
+        Group(special + (!special >> 7))
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ impl Group {`
`122`	`122`	/// - `FULL => DELETED`
`123`	`123`	`#[inline]`
`124`	`124`	`pub fn convert_special_to_empty_and_full_to_deleted(&self) -> Group {`
`125`		`- Group(((self.0 & repeat(0x80)) >> 7) * 0xff)`
	`125`	`+ let special = self.0 & repeat(0x80);`
	`126`	`+ Group(special + (!special >> 7))`
`126`	`127`	`}`
`127`	`128`	`}`