Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix documentation + whitespace #154

Merged
merged 7 commits into from
Mar 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ script:
- . ./.travis.sh # conditionally installs Swift 2.2 on Linux
- export PATH=$TRAVIS_BUILD_DIR/swift-2.2-RELEASE-ubuntu14.04/usr/bin/:"${PATH}" # adds Swift 2.2 to PATH
- make # compiles project with Swift 2.2
- make release # compiles optimized
- sudo make install # installs shared libs and CLI
- vapor build Sources/VaporDev/main.swift Sources/VaporDev/**/*.swift # builds VaporDev with CLI
- rm -rf Packages .build # cleans project to prevent conflicts between 2.2 and 3.0
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)" # Installs swiftenv
- swift build --fetch # clones all dependencies
- rm -rf Packages/*/Tests # fixes SPM bug
- swift build
- swift build --configuration release
- swift test
2 changes: 1 addition & 1 deletion Sources/Generator/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ struct Func: CustomStringConvertible {
//ensure conversion worked
for wildcard in wildcards {
f += "\t\t\tguard let c\(wildcard.name) = e\(wildcard.name) else {\n"
f += "\t\t\t\tthrow Abort.BadRequest\n"
f += "\t\t\t\tthrow Abort.InvalidParameter(\"\(wildcard.name)\", \(wildcard.generic).self)\n"
f += "\t\t\t}\n"
}

Expand Down