Update tutorial builtin contract list #170
Conversation
E.g. RangeOf[Nat] or RangeOf[String] or ... Includes tests but not TUTORIAL.md as that is under potential change from pull request egonSchiele#170.
| * [`KeywordArgs`](http://www.rubydoc.info/gems/contracts/Contracts/KeywordArgs) – checks that the argument is an options hash, and all required keyword arguments are present, and all values pass their respective contracts, e.g. `KeywordArgs[:number => Num, :description => Optional[String]]` | ||
| * [`Optional`](http://www.rubydoc.info/gems/contracts/Contracts/Optional) – checks that the keyword argument is either not present or pass the given contract, can not be used outside of `KeywordArgs` contract, e.g. `Optional[Num]` | ||
|
|
||
| * Validators |
There was a problem hiding this comment.
Maybe Duck typing ? WDYT?
|
Looks good |
|
"Duck typing" sounds quite reasonable. |
|
This PR needs to be rebased against master (last merge to master has fixed issue on travis) |
|
OK. Can you give me advice on how to do this? I'm fine with rebasing within a branch, but I'm not sure how to rebase an existing branch onto master. I've googled and there's information, so that's no problem, but wouldn't I then need to |
|
Force pushing a public branch is generally not a good idea, but only if other people are using it. So in this case you could rebase this branch against master and force push it because it's not a publicly used branch. |
|
Cool, thanks. On Sat, Jul 4, 2015 at 12:34 PM, Nathan Lilienthal
|
|
Thanks for these PRs @gsinclair! Just waiting for the rebase before I merge this. |
|
OK, I hope I've done it right. Can you check? |
|
@gsinclair Doesn't look like you have successfully rebased against upstream master, or probably something else, that conflicts with this change, was merged in between. Just in case, my usual rebase procedure: https://gist.github.com/waterlink/ee7600e499d2ca8c596f |
gsinclair
force-pushed
the
update_tutorial_contract_list
branch
from
087d1c0 to
58620a3
Compare
|
Thanks for your procedure; it was helpful. I've followed it, resolved conflicts, and force pushed my topic branch again. Should be OK now, I'd say. Note: my branch has five commits; please feel free to squash them into one before merging. I'd happily do that for you, but it's not my call. |
|
@gsinclair Thanks |
Update tutorial builtin contract list
There are three commits in this pull request. One to add Eq and Func. One to arrange the list into groups. One to make a few changes to wording and examples.
This addresses the documentation deficiency identified in #168.