Auto merge of #34 - nox:backcompat, r=emilio

Support Rust 1.15

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/unicode-bidi/34)
<!-- Reviewable:end -->

Author: bors-servo

.travis.yml

@@ -5,6 +5,7 @@ rust:
   - nightly
   - beta
   - stable
+  - 1.15.0
 
 matrix:
   fast_finish: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "unicode-bidi"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["The Servo Project Developers"]
 license = "MIT / Apache-2.0"
 description = "Implementation of the Unicode Bidirectional Algorithm"

src/lib.rs

@@ -208,9 +208,9 @@ impl<'text> InitialInfo<'text> {
         assert!(original_classes.len() == text.len());
 
         InitialInfo {
-            text,
-            original_classes,
-            paragraphs,
+            text: text,
+            original_classes: original_classes,
+            paragraphs: paragraphs,
         }
     }
 }
@@ -284,10 +284,10 @@ impl<'text> BidiInfo<'text> {
         }
 
         BidiInfo {
-            text,
-            original_classes,
-            paragraphs,
-            levels,
+            text: text,
+            original_classes: original_classes,
+            paragraphs: paragraphs,
+            levels: levels,
         }
     }
 
@@ -460,7 +460,7 @@ mod tests {
         assert_eq!(
             InitialInfo::new(text, None),
             InitialInfo {
-                text,
+                text: &text,
                 original_classes: vec![L, EN],
                 paragraphs: vec![
                     ParagraphInfo {
@@ -475,7 +475,7 @@ mod tests {
         assert_eq!(
             InitialInfo::new(text, None),
             InitialInfo {
-                text,
+                text: &text,
                 original_classes: vec![AL, AL, WS, R, R],
                 paragraphs: vec![
                     ParagraphInfo {
@@ -490,7 +490,7 @@ mod tests {
         assert_eq!(
             InitialInfo::new(text, None),
             InitialInfo {
-                text,
+                text: &text,
                 original_classes: vec![L, B, B, B, L],
                 paragraphs: vec![
                     ParagraphInfo {
@@ -527,7 +527,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, Some(Level::ltr())),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[0, 0, 0, 0, 0, 0]),
                 original_classes: vec![L, L, L, EN, EN, EN],
                 paragraphs: vec![
@@ -543,7 +543,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, Some(Level::ltr())),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[0, 0, 0, 0, 1, 1, 1, 1, 1, 1]),
                 original_classes: vec![L, L, L, WS, R, R, R, R, R, R],
                 paragraphs: vec![
@@ -557,7 +557,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, Some(Level::rtl())),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[2, 2, 2, 1, 1, 1, 1, 1, 1, 1]),
                 original_classes: vec![L, L, L, WS, R, R, R, R, R, R],
                 paragraphs: vec![
@@ -573,7 +573,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, Some(Level::ltr())),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[1, 1, 1, 1, 1, 1, 0, 0, 0, 0]),
                 original_classes: vec![R, R, R, R, R, R, WS, L, L, L],
                 paragraphs: vec![
@@ -587,7 +587,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, None),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[1, 1, 1, 1, 1, 1, 1, 2, 2, 2]),
                 original_classes: vec![R, R, R, R, R, R, WS, L, L, L],
                 paragraphs: vec![
@@ -603,7 +603,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, Some(Level::ltr())),
             BidiInfo {
-                text,
+                text: &text,
                 levels: Level::vec(&[1, 1, 2, 1, 1, 1, 1, 1, 2, 1, 1]),
                 original_classes: vec![AL, AL, EN, AL, AL, WS, R, R, EN, R, R],
                 paragraphs: vec![
@@ -619,7 +619,7 @@ mod tests {
         assert_eq!(
             BidiInfo::new(text, None),
             BidiInfo {
-                text,
+                text: &text,
                 original_classes: vec![L, WS, R, R, CS, B, R, R],
                 levels: Level::vec(&[0, 0, 1, 1, 0, 0, 1, 1]),
                 paragraphs: vec![

tests/conformance_tests.rs

@@ -88,8 +88,8 @@ fn test_basic_conformance() {
                 if levels != exp_levels {
                     fails.push(
                         Fail {
-                            line_num,
-                            input_base_level,
+                            line_num: line_num,
+                            input_base_level: input_base_level,
                             input_classes: input_classes.iter().map(|x| x.to_string()).collect(),
                             input_string: input_string.to_owned(),
                             exp_base_level: None,
@@ -172,8 +172,8 @@ fn test_character_conformance() {
             if levels != exp_levels {
                 fails.push(
                     Fail {
-                        line_num,
-                        input_base_level,
+                        line_num: line_num,
+                        input_base_level: input_base_level,
                         input_classes: vec![],
                         input_string: input_string.to_owned(),
                         exp_base_level: Some(exp_base_level),
@@ -216,7 +216,7 @@ fn test_character_conformance() {
 // TODO: Support auto-RTL
 fn gen_base_levels_for_base_tests(bitset: u8) -> Vec<Option<Level>> {
     /// Values: auto-LTR, LTR, RTL
-    const VALUES: &[Option<Level>] = &[None, Some(level::LTR_LEVEL), Some(level::RTL_LEVEL)];
+    const VALUES: &'static [Option<Level>] = &[None, Some(level::LTR_LEVEL), Some(level::RTL_LEVEL)];
     assert!(bitset < (1 << VALUES.len()));
     (0..VALUES.len())
         .filter(|bit| bitset & (1u8 << bit) == 1)
@@ -227,7 +227,7 @@ fn gen_base_levels_for_base_tests(bitset: u8) -> Vec<Option<Level>> {
 // TODO: Support auto-RTL
 fn gen_base_level_for_characters_tests(idx: usize) -> Option<Level> {
     /// Values: LTR, RTL, auto-LTR
-    const VALUES: &[Option<Level>] = &[Some(level::LTR_LEVEL), Some(level::RTL_LEVEL), None];
+    const VALUES: &'static [Option<Level>] = &[Some(level::LTR_LEVEL), Some(level::RTL_LEVEL), None];
     assert!(idx < VALUES.len());
     VALUES[idx]
 }