Skip to content

Rollup of 9 pull requests #60859

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.

Sign up for GitHub

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
Centril wants to merge 27 commits into from
Closed

Rollup of 9 pull requests #60859

Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
08b0aca
string: implement From<&String> for String
jsgf Apr 9, 2019
eba03d4
Fix convert module's documentation links
czipperz Apr 12, 2019
6bf94cd
Remove dangling ` in Into documentation
czipperz Apr 13, 2019
b701d32
Remove broken links to self in Into documentation
czipperz Apr 13, 2019
4a33ece
Remove blank lines in AsRef documentation
czipperz Apr 13, 2019
27ff536
Reorder blank lines in AsMut documentation
czipperz Apr 13, 2019
1e48da6
Escape &str in convert docs
czipperz Apr 13, 2019
1f5d510
Fix stray ` in previous change
czipperz Apr 14, 2019
c921aae
Include expression to wait for to the span of Await
topecongiro May 10, 2019
1ea7c5f
Update ui test
topecongiro May 10, 2019
e392db6
Update rustc book CLI docs.
ehuss May 12, 2019
d29f0d2
Move token tree related lexer state to a separate struct
matklad May 12, 2019
b91e0a3
move span and token to tt reader
matklad May 13, 2019
e249f2e
move raw span to tt reader
matklad May 13, 2019
ea93215
Bump measureme dependency to 0.3
wesleywiser May 14, 2019
7171bd1
README: Mention MSVC 2017+, not 2013(!)
scottmcm May 14, 2019
1107158
Use `Symbol` more in lint APIs
oli-obk May 14, 2019
65d09ea
Move `box` from the stable keyword to unstable keywords list
Pulkit07 May 15, 2019
3ed9c54
Rollup merge of #59825 - jsgf:from-ref-string, r=sfackler
Centril May 15, 2019
c526a7c
Rollup merge of #59923 - czipperz:fix-convert-doc-links, r=steveklabnik
Centril May 15, 2019
9952052
Rollup merge of #60691 - topecongiro:await-macro-span, r=Centril
Centril May 15, 2019
04ac4bf
Rollup merge of #60763 - matklad:tt-parser, r=petrochenkov
Centril May 15, 2019
a82b43d
Rollup merge of #60769 - ehuss:rustc-cli-docs, r=steveklabnik
Centril May 15, 2019
7fc0f76
Rollup merge of #60811 - wesleywiser:bump_measureme, r=varkor
Centril May 15, 2019
e43aff7
Rollup merge of #60816 - scottmcm:vcpp-download-link, r=alexcrichton
Centril May 15, 2019
e40f14a
Rollup merge of #60827 - oli-obk:late_symbol, r=nnethercote
Centril May 15, 2019
9ad3d8f
Rollup merge of #60851 - Pulkit07:issue60849, r=Centril
Centril May 15, 2019
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
2 changes: 1 addition & 1 deletion src/libsyntax_pos/symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ symbols! {

// Keywords that are used in stable Rust.
As: "as",
Box: "box",
Break: "break",
Const: "const",
Continue: "continue",
Expand Down Expand Up @@ -69,6 +68,7 @@ symbols! {
// Keywords that are used in unstable Rust or reserved for future use.
Abstract: "abstract",
Become: "become",
Box: "box",
Do: "do",
Final: "final",
Macro: "macro",
Expand Down