Skip to content

Rollup of 13 pull requests #21383

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

Closed
wants to merge 27 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
935b37a
fix string multi line connector '\' for kate
visualfc Jan 14, 2015
fbcc34f
Grammar tweak to old guide stub documents.
timparenti Jan 17, 2015
812ce6c
Remove unnecessary explicit conversions to *const T
petrochenkov Jan 17, 2015
4d31700
Update rustdoc man page
Jan 17, 2015
ac4baca
Passable nano syntax highlighting
look Jan 17, 2015
b6b8880
Improve the error message when source file cannot be read
Jan 17, 2015
2b6efbf
fix an error about the static lifetime
glacjay Jan 18, 2015
d0eb85d
Redo Segmented stack support for DragonFly
mneumann Jan 18, 2015
66003c0
docs: replace deprecated integer suffixes from examples
Jan 18, 2015
17ffe51
Remove redundant "Right now"
kimroen Jan 18, 2015
5431727
docs: replacing more deprecated integer suffixes
Jan 18, 2015
ab73d45
fix formatting
glacjay Jan 18, 2015
e28da7a
Fix std::marker.
WiSaGaN Jan 18, 2015
21f4483
Use 'in' instead of 'find()' in tidy.py
iKevinY Jan 18, 2015
f6050ac
Rollup merge of #21280 - timparenti:old-guide-stub-grammar, r=alexcri…
alexcrichton Jan 19, 2015
0ea22d1
Rollup merge of #21355 - alfie:suffix, r=steveklabnik
alexcrichton Jan 19, 2015
9489d82
Rollup merge of #21309 - thorncp:rustdoc-man-page, r=kmcallister
alexcrichton Jan 19, 2015
2d4accd
Rollup merge of #21326 - look:nano-syntax-highlighting, r=kmcallister
alexcrichton Jan 19, 2015
0ef7c54
Rollup merge of #21336 - rylev:better-nofile-error, r=brson
alexcrichton Jan 19, 2015
9fc1b70
Rollup merge of #21345 - glacjay:patch-1, r=alexcrichton
alexcrichton Jan 19, 2015
e4f6f1b
Rollup merge of #21357 - kimroen:patch-1, r=sanxiyn
alexcrichton Jan 19, 2015
39f82c8
Rollup merge of #21358 - glacjay:patch-2, r=alexcrichton
alexcrichton Jan 19, 2015
8b5f3ce
Rollup merge of #21359 - WiSaGaN:bugfix/fix_marker, r=alexcrichton
alexcrichton Jan 19, 2015
241d8a4
Rollup merge of #21375 - petrochenkov:ssbsl, r=alexcrichton
alexcrichton Jan 19, 2015
f8ba91e
Rollup merge of #21377 - iKevinY:speedy-tidy, r=huonw
alexcrichton Jan 19, 2015
9620ac3
Rollup merge of #21123 - visualfc:master, r=alexcrichton
alexcrichton Jan 19, 2015
3c42e14
Rollup merge of #20991 - mneumann:llvm-dragonfly-take2, r=alexcrichton
alexcrichton Jan 19, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix formatting
  • Loading branch information
glacjay committed Jan 18, 2015
commit ab73d455fe38b1fc18e15302b98a5cbfdb0dc94e
1 change: 1 addition & 0 deletions src/doc/trpl/macros.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ So `($x:ident -> (($e:expr)))`, though excessively fancy, would designate a macr
that could be invoked like: `my_macro!(i->(( 2+2 )))`.

To avoid ambiguity, macro invocation syntax must conform to the following rules:

* `expr` must be followed by `=>`, `,` or `;`.
* `ty` and `path` must be followed by `=>`, `,`, `:`, `=`, `>` or `as`.
* `pat` must be followed by `=>`, `,` or `=`.
Expand Down