diff options
| author | bors <bors@rust-lang.org> | 2019-10-09 03:32:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-09 03:32:21 +0000 |
| commit | 275cf4bcacad3fbe5539ecd5840462793ae46eec (patch) | |
| tree | 907f93d50a06e4997a8b0b29214bc219243810c6 /src/libsyntax_pos | |
| parent | b5bd31ec6db6a249311888a93fc176f06dcb6aa6 (diff) | |
| parent | e27f0298363f6ca60bb5761a8c74d52b3999a061 (diff) | |
| download | rust-275cf4bcacad3fbe5539ecd5840462793ae46eec.tar.gz rust-275cf4bcacad3fbe5539ecd5840462793ae46eec.zip | |
Auto merge of #65229 - Centril:rollup-wnr46vg, r=Centril
Rollup of 4 pull requests Successful merges: - #64656 (Implement (HashMap) Entry::insert as per #60142) - #65037 (`#[track_caller]` feature gate (RFC 2091 1/N)) - #65166 (Suggest to add `move` keyword for generator capture) - #65175 (add more info in debug traces for gcu merging) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index c7230d5ca15..2b005c3fc42 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -674,6 +674,7 @@ symbols! { tool_attributes, tool_lints, trace_macros, + track_caller, trait_alias, transmute, transparent, |