From 3dd55ddaef13d4317443335dc9e85438933f74c0 Mon Sep 17 00:00:00 2001
From: Eduardo Gulias Davis <eduardomgulias@gmail.com>
Date: Wed, 20 Jul 2016 00:53:14 +0200
Subject: [PATCH 1/2] Change apostrophe in error message

I'm not sure if this was intentionally left with `'` instead of ` in the closing apostrophe, but just in case it was not I made the PR.
Scala CLA has been signed.
---
 src/main/scala/scala/util/parsing/combinator/Parsers.scala      | 2 +-
 .../scala/util/parsing/combinator/PackratParsersTest.scala      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/scala/util/parsing/combinator/Parsers.scala b/src/main/scala/scala/util/parsing/combinator/Parsers.scala
index 115ee135..f8190e37 100644
--- a/src/main/scala/scala/util/parsing/combinator/Parsers.scala
+++ b/src/main/scala/scala/util/parsing/combinator/Parsers.scala
@@ -565,7 +565,7 @@ trait Parsers {
    *  @return a `tParser` that succeeds if `e` is the next available input.
    */
 
-  implicit def accept(e: Elem): Parser[Elem] = acceptIf(_ == e)("`"+e+"' expected but " + _ + " found")
+  implicit def accept(e: Elem): Parser[Elem] = acceptIf(_ == e)("'"+e+"' expected but " + _ + " found")
 
   /** A parser that matches only the given list of element `es`.
    *
diff --git a/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala b/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala
index 5a7e6d2e..aec44bc0 100644
--- a/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala
+++ b/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala
@@ -122,7 +122,7 @@ class PackratParsersTest {
       val failure = parseResult.asInstanceOf[Failure]
       assertEquals(expectedFailureMsg, failure.msg)
     }
-    assertFailure("``b'' expected but `c' found", "a a a a b b b c c c c")
+    assertFailure("'`b'' expected but `c' found", "a a a a b b b c c c c")
     assertFailure("end of input", "a a a a b b b b c c c")
   }
 

From ac7c33fbab65e3af062565851219eab7f1cec4e3 Mon Sep 17 00:00:00 2001
From: Eduardo Gulias Davis <me@egulias.com>
Date: Fri, 9 Sep 2016 22:43:15 +0200
Subject: [PATCH 2/2] fix travis-ci hosts

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cdb254b7..501e32d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ language: scala
 before_install:
   - cat /etc/hosts # optionally check the content *before*
   - sudo hostname "$(hostname | cut -c1-63)"
-  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts | sudo tee /etc/hosts
+  - sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts
+  - sudo mv /tmp/hosts /etc/hosts
   - cat /etc/hosts # optionally check the content *after*
 
 env: