diff options
| author | Seth Tisue <seth@tisue.net> | 2017-03-21 14:38:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 14:38:39 -0700 |
| commit | 57948c87452882f734ba1058d0b124198c709e5c (patch) | |
| tree | 7a6532c6ff12a2e30cd17d0a1684d69b54d361cf /project | |
| parent | c7c21525ec2f53d865cea3b1a6fca68508e45579 (diff) | |
| parent | 4b9816100c704fd8ecfb1a8fa66f86e6284c07cb (diff) | |
| download | scala-57948c87452882f734ba1058d0b124198c709e5c.tar.gz scala-57948c87452882f734ba1058d0b124198c709e5c.tar.bz2 scala-57948c87452882f734ba1058d0b124198c709e5c.zip | |
Merge pull request #5791 from SethTisue/cruft-begone
remove a bunch of old cruft
Diffstat (limited to 'project')
| -rw-r--r-- | project/MiMa.scala | 2 | ||||
| -rw-r--r-- | project/PartestUtil.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/MiMa.scala b/project/MiMa.scala index fb9bb175ab..a47856b1fd 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -51,7 +51,7 @@ object MiMa { "--curr", curr.getAbsolutePath, "--filters", filter.getAbsolutePath, "--generate-filters", - // !!! Command line MiMa (which we call rathan the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly + // !!! Command line MiMa (which we call rather than the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly // defaults to no checking (!) if this isn't specified. Fixed in https://github.com/typesafehub/migration-manager/pull/138 // TODO: Try out the new "--direction both" mode of MiMa "--direction", "backwards" diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala index 6d2c9a4c45..40031192e4 100644 --- a/project/PartestUtil.scala +++ b/project/PartestUtil.scala @@ -87,7 +87,7 @@ object PartestUtil { token(grepOption <~ Space) ~> token(globOrPattern, tokenCompletion) } - val SrcPath = ((token(srcPathOption) <~ Space) ~ token(StringBasic.examples(Set("files", "pending", "scaladoc")))) map { + val SrcPath = ((token(srcPathOption) <~ Space) ~ token(StringBasic.examples(Set("files", "scaladoc")))) map { case opt ~ path => srcPath = path opt + " " + path |