mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge mozilla-central to autoland. a=merge on a CLOSED TREE

This commit is contained in:
Razvan Maries 2019-01-09 00:09:23 +02:00
Родитель 15cbe4a2c3 f4c5025ab9
Коммит 7192c6023a
76 изменённых файлов: 2621 добавлений и 1323 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

78
Cargo.lock сгенерированный
Просмотреть файл

@ -622,9 +622,9 @@ dependencies = [
"itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -720,9 +720,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -731,8 +731,8 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"darling_core 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "darling_core 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -898,9 +898,9 @@ name = "failure_derive"
version = "0.1.3" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1478,8 +1478,8 @@ dependencies = [
name = "malloc_size_of_derive" name = "malloc_size_of_derive"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1766,8 +1766,8 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1954,7 +1954,7 @@ dependencies = [
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "0.4.9" version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2005,10 +2005,10 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
version = "0.6.3" version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2221,9 +2221,9 @@ name = "scroll_derive"
version = "0.9.5" version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2277,9 +2277,9 @@ name = "serde_derive"
version = "1.0.80" version = "1.0.80"
source = "git+https://github.com/servo/serde?branch=deserialize_from_enums9#e0cc925c259cb74ce41377e4fe02713adfa6d836" source = "git+https://github.com/servo/serde?branch=deserialize_from_enums9#e0cc925c259cb74ce41377e4fe02713adfa6d836"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2390,8 +2390,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2465,9 +2465,9 @@ name = "style_derive"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"darling 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "darling 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
"synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2521,18 +2521,18 @@ name = "syn"
version = "0.14.6" version = "0.14.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "syn" name = "syn"
version = "0.15.7" version = "0.15.24"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2541,9 +2541,9 @@ name = "synstructure"
version = "0.10.1" version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3354,11 +3354,11 @@ dependencies = [
"checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0" "checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0"
"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
"checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4" "checksum proc-macro2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "77997c53ae6edd6d187fec07ec41b207063b5ee6f33680e9fa86d405cdd313d4"
"checksum proc-macro2 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "cccdc7557a98fe98453030f077df7f3a042052fae465bb61d2c2c41435cfd9b6" "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
"checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260" "checksum procedural-masquerade 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f566249236c6ca4340f7ca78968271f0ed2b0f234007a61b66f9ecd0af09260"
"checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4" "checksum quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eda5fe9b71976e62bc81b781206aaa076401769b2143379d3eb2118388babac4"
"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8" "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
"checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035" "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
"checksum rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "485541959c8ecc49865526fe6c4de9653dd6e60d829d6edf0be228167b60372d" "checksum rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "485541959c8ecc49865526fe6c4de9653dd6e60d829d6edf0be228167b60372d"
@ -3406,7 +3406,7 @@ dependencies = [
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
"checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59" "checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59"
"checksum syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4b5274d4a0a3d2749d5c158dc64d3403e60554dc61194648787ada5212473d" "checksum syn 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4b5274d4a0a3d2749d5c158dc64d3403e60554dc61194648787ada5212473d"
"checksum syn 0.15.7 (registry+https://github.com/rust-lang/crates.io-index)" = "455a6ec9b368f8c479b0ae5494d13b22dc00990d2f00d68c9dc6a2dc4f17f210" "checksum syn 0.15.24 (registry+https://github.com/rust-lang/crates.io-index)" = "734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c"
"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
"checksum target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4af5e2227f0b887d591d3724b796a96eff04226104d872f5b3883fcd427d64b9" "checksum target-lexicon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4af5e2227f0b887d591d3724b796a96eff04226104d872f5b3883fcd427d64b9"
"checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6"

8
browser/base/content/tabbrowser.xml
Просмотреть файл

@ -34,7 +34,7 @@
// - for vertical orientation // - for vertical orientation
// - corresponding to an overflow event that we ignored // - corresponding to an overflow event that we ignored
let tabs = document.getBindingParent(this); let tabs = document.getBindingParent(this);
if (event.originalTarget != this._scrollbox || if (event.originalTarget != this.scrollbox ||
event.detail == 0 || event.detail == 0 ||
!tabs.hasAttribute("overflow")) { !tabs.hasAttribute("overflow")) {
return; return;
@ -56,7 +56,7 @@
// Ignore overflow events: // Ignore overflow events:
// - from nested scrollable elements // - from nested scrollable elements
// - for vertical orientation // - for vertical orientation
if (event.originalTarget != this._scrollbox || if (event.originalTarget != this.scrollbox ||
event.detail == 0) { event.detail == 0) {
return; return;
} }
@ -634,7 +634,7 @@
let leftMovingTabScreenX = movingTabs[0].boxObject.screenX; let leftMovingTabScreenX = movingTabs[0].boxObject.screenX;
let translateX = screenX - draggedTab._dragData.screenX; let translateX = screenX - draggedTab._dragData.screenX;
if (!pinned) { if (!pinned) {
translateX += this.arrowScrollbox._scrollbox.scrollLeft - draggedTab._dragData.scrollX; translateX += this.arrowScrollbox.scrollbox.scrollLeft - draggedTab._dragData.scrollX;
} }
let leftBound = leftTab.boxObject.screenX - leftMovingTabScreenX; let leftBound = leftTab.boxObject.screenX - leftMovingTabScreenX;
let rightBound = (rightTab.boxObject.screenX + rightTab.boxObject.width) - let rightBound = (rightTab.boxObject.screenX + rightTab.boxObject.width) -
@ -1555,7 +1555,7 @@
tab._dragData = { tab._dragData = {
offsetX: event.screenX - window.screenX - tabOffsetX, offsetX: event.screenX - window.screenX - tabOffsetX,
offsetY: event.screenY - window.screenY, offsetY: event.screenY - window.screenY,
scrollX: this.arrowScrollbox._scrollbox.scrollLeft, scrollX: this.arrowScrollbox.scrollbox.scrollLeft,
screenX: event.screenX, screenX: event.screenX,
movingTabs: (tab.multiselected ? gBrowser.selectedTabs : [tab]) movingTabs: (tab.multiselected ? gBrowser.selectedTabs : [tab])
.filter(t => t.pinned == tab.pinned), .filter(t => t.pinned == tab.pinned),

39
browser/base/content/test/forms/browser_selectpopup.js
Просмотреть файл

@ -462,51 +462,64 @@ async function performLargePopupTests(win) {
// Check if a drag-select works and scrolls the list. // Check if a drag-select works and scrolls the list.
await openSelectPopup(selectPopup, "mousedown", "select", win); await openSelectPopup(selectPopup, "mousedown", "select", win);
let scrollPos = selectPopup.scrollBox.scrollTop; let getScrollPos = () => selectPopup.scrollBox.scrollbox.scrollTop;
let scrollPos = getScrollPos();
let popupRect = selectPopup.getBoundingClientRect(); let popupRect = selectPopup.getBoundingClientRect();
// First, check that scrolling does not occur when the mouse is moved over the // First, check that scrolling does not occur when the mouse is moved over the
// anchor button but not the popup yet. // anchor button but not the popup yet.
EventUtils.synthesizeMouseAtPoint(popupRect.left + 5, popupRect.top - 10, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 5, popupRect.top - 10, { type: "mousemove" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position after mousemove over button should not change"); is(getScrollPos(), scrollPos, "scroll position after mousemove over button should not change");
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top + 10, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top + 10, { type: "mousemove" }, win);
// Dragging above the popup scrolls it up. // Dragging above the popup scrolls it up.
let scrolledPromise = BrowserTestUtils.waitForEvent(selectPopup, "scroll", false,
() => getScrollPos() < scrollPos - 5);
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" }, win);
ok(selectPopup.scrollBox.scrollTop < scrollPos - 5, "scroll position at drag up"); await scrolledPromise;
ok(true, "scroll position at drag up");
// Dragging below the popup scrolls it down. // Dragging below the popup scrolls it down.
scrollPos = selectPopup.scrollBox.scrollTop; scrollPos = getScrollPos();
scrolledPromise = BrowserTestUtils.waitForEvent(selectPopup, "scroll", false,
() => getScrollPos() > scrollPos + 5);
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win);
ok(selectPopup.scrollBox.scrollTop > scrollPos + 5, "scroll position at drag down"); await scrolledPromise;
ok(true, "scroll position at drag down");
// Releasing the mouse button and moving the mouse does not change the scroll position. // Releasing the mouse button and moving the mouse does not change the scroll position.
scrollPos = selectPopup.scrollBox.scrollTop; scrollPos = getScrollPos();
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position at mouseup should not change"); is(getScrollPos(), scrollPos, "scroll position at mouseup should not change");
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position at mousemove after mouseup should not change"); is(getScrollPos(), scrollPos, "scroll position at mousemove after mouseup should not change");
// Now check dragging with a mousedown on an item // Now check dragging with a mousedown on an item
let menuRect = selectPopup.children[51].getBoundingClientRect(); let menuRect = selectPopup.children[51].getBoundingClientRect();
EventUtils.synthesizeMouseAtPoint(menuRect.left + 5, menuRect.top + 5, { type: "mousedown" }, win); EventUtils.synthesizeMouseAtPoint(menuRect.left + 5, menuRect.top + 5, { type: "mousedown" }, win);
// Dragging below the popup scrolls it down. // Dragging below the popup scrolls it down.
scrolledPromise = BrowserTestUtils.waitForEvent(selectPopup, "scroll", false,
() => getScrollPos() > scrollPos + 5);
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win);
ok(selectPopup.scrollBox.scrollTop > scrollPos + 5, "scroll position at drag down from option"); await scrolledPromise;
ok(true, "scroll position at drag down from option");
// Dragging above the popup scrolls it up. // Dragging above the popup scrolls it up.
scrolledPromise = BrowserTestUtils.waitForEvent(selectPopup, "scroll", false,
() => getScrollPos() < scrollPos - 5);
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position at drag up from option"); await scrolledPromise;
ok(true, "scroll position at drag up from option");
scrollPos = selectPopup.scrollBox.scrollTop; scrollPos = getScrollPos();
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position at mouseup from option should not change"); is(getScrollPos(), scrollPos, "scroll position at mouseup from option should not change");
EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win); EventUtils.synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" }, win);
is(selectPopup.scrollBox.scrollTop, scrollPos, "scroll position at mousemove after mouseup should not change"); is(getScrollPos(), scrollPos, "scroll position at mousemove after mouseup should not change");
await hideSelectPopup(selectPopup, "escape", win); await hideSelectPopup(selectPopup, "escape", win);

2
browser/base/content/test/tabs/browser_overflowScroll.js
Просмотреть файл

@ -8,7 +8,7 @@ requestLongerTimeout(2);
*/ */
add_task(async function() { add_task(async function() {
let arrowScrollbox = gBrowser.tabContainer.arrowScrollbox; let arrowScrollbox = gBrowser.tabContainer.arrowScrollbox;
let scrollbox = arrowScrollbox._scrollbox; let scrollbox = arrowScrollbox.scrollbox;
let originalSmoothScroll = arrowScrollbox.smoothScroll; let originalSmoothScroll = arrowScrollbox.smoothScroll;
let tabs = gBrowser.tabs; let tabs = gBrowser.tabs;
let tabMinWidth = parseInt(getComputedStyle(gBrowser.selectedTab, null).minWidth); let tabMinWidth = parseInt(getComputedStyle(gBrowser.selectedTab, null).minWidth);

2
dom/base/nsImageLoadingContent.h
Просмотреть файл

@ -200,8 +200,6 @@ class nsImageLoadingContent : public nsIImageLoadingContent {
*/ */
void DestroyImageLoadingContent(); void DestroyImageLoadingContent();
void ClearBrokenState() { mBroken = false; }
/** /**
* Returns the CORS mode that will be used for all future image loads. The * Returns the CORS mode that will be used for all future image loads. The
* default implementation returns CORS_NONE unconditionally. * default implementation returns CORS_NONE unconditionally.

5
dom/html/HTMLImageElement.cpp
Просмотреть файл

@ -525,11 +525,6 @@ nsresult HTMLImageElement::BindToTree(Document* aDocument, nsIContent* aParent,
// initaiated by a user interaction. // initaiated by a user interaction.
mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput(); mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput();
// FIXME: Bug 660963 it would be nice if we could just have
// ClearBrokenState update our state and do it fast...
ClearBrokenState();
RemoveStatesSilently(NS_EVENT_STATE_BROKEN);
// We still act synchronously for the non-responsive case (Bug // We still act synchronously for the non-responsive case (Bug
// 1076583), but still need to delay if it is unsafe to run // 1076583), but still need to delay if it is unsafe to run
// script. // script.

4
dom/html/HTMLInputElement.cpp
Просмотреть файл

@ -4339,10 +4339,6 @@ nsresult HTMLInputElement::BindToTree(Document* aDocument, nsIContent* aParent,
// initaiated by a user interaction. // initaiated by a user interaction.
mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput(); mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput();
// FIXME: Bug 660963 it would be nice if we could just have
// ClearBrokenState update our state and do it fast...
ClearBrokenState();
RemoveStatesSilently(NS_EVENT_STATE_BROKEN);
nsContentUtils::AddScriptRunner( nsContentUtils::AddScriptRunner(
NewRunnableMethod("dom::HTMLInputElement::MaybeLoadImage", this, NewRunnableMethod("dom::HTMLInputElement::MaybeLoadImage", this,
&HTMLInputElement::MaybeLoadImage)); &HTMLInputElement::MaybeLoadImage));

7
dom/html/reftests/bug1512297-ref.html Normal file
Просмотреть файл

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<head></head>
<body>
<div><img src="" alt="ALT"></div>
</body>
</html>

14
dom/html/reftests/bug1512297.html Normal file
Просмотреть файл

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head class="reftest-wait"></head>
<body>
<div><img src="" alt="ALT"></div>
<script>
var img = document.querySelector('img');
img.remove();
var div = document.querySelector('div');
div.appendChild(img);
</script>
</body>
</html>

2
dom/html/reftests/reftest.list
Просмотреть файл

@ -64,6 +64,8 @@ pref(permissions.default.image,2) HTTP == bug1196784-with-srcset.html bug1196784
# Test video with rotation information can be rotated. # Test video with rotation information can be rotated.
== bug1228601-video-rotation-90.html bug1228601-video-rotated-ref.html == bug1228601-video-rotation-90.html bug1228601-video-rotated-ref.html
== bug1512297.html bug1512297-ref.html
# Test that dynamically setting body margin attributes updates style appropriately # Test that dynamically setting body margin attributes updates style appropriately
== body-topmargin-dynamic.html body-topmargin-ref.html == body-topmargin-dynamic.html body-topmargin-ref.html

4
dom/svg/SVGFEImageElement.cpp
Просмотреть файл

@ -142,10 +142,6 @@ nsresult SVGFEImageElement::BindToTree(Document* aDocument, nsIContent* aParent,
if (mStringAttributes[HREF].IsExplicitlySet() || if (mStringAttributes[HREF].IsExplicitlySet() ||
mStringAttributes[XLINK_HREF].IsExplicitlySet()) { mStringAttributes[XLINK_HREF].IsExplicitlySet()) {
// FIXME: Bug 660963 it would be nice if we could just have
// ClearBrokenState update our state and do it fast...
ClearBrokenState();
RemoveStatesSilently(NS_EVENT_STATE_BROKEN);
nsContentUtils::AddScriptRunner( nsContentUtils::AddScriptRunner(
NewRunnableMethod("dom::SVGFEImageElement::MaybeLoadSVGImage", this, NewRunnableMethod("dom::SVGFEImageElement::MaybeLoadSVGImage", this,
&SVGFEImageElement::MaybeLoadSVGImage)); &SVGFEImageElement::MaybeLoadSVGImage));

4
dom/svg/SVGImageElement.cpp
Просмотреть файл

@ -190,10 +190,6 @@ nsresult SVGImageElement::BindToTree(Document* aDocument, nsIContent* aParent,
if (mStringAttributes[HREF].IsExplicitlySet() || if (mStringAttributes[HREF].IsExplicitlySet() ||
mStringAttributes[XLINK_HREF].IsExplicitlySet()) { mStringAttributes[XLINK_HREF].IsExplicitlySet()) {
// FIXME: Bug 660963 it would be nice if we could just have
// ClearBrokenState update our state and do it fast...
ClearBrokenState();
RemoveStatesSilently(NS_EVENT_STATE_BROKEN);
nsContentUtils::AddScriptRunner( nsContentUtils::AddScriptRunner(
NewRunnableMethod("dom::SVGImageElement::MaybeLoadSVGImage", this, NewRunnableMethod("dom::SVGImageElement::MaybeLoadSVGImage", this,
&SVGImageElement::MaybeLoadSVGImage)); &SVGImageElement::MaybeLoadSVGImage));

3
layout/xul/nsMenuFrame.cpp
Просмотреть файл

@ -1208,8 +1208,7 @@ bool nsMenuFrame::SizeToPopup(nsBoxLayoutState& aState, nsSize& aSize) {
// if there is a scroll frame, add the desired width of the scrollbar as // if there is a scroll frame, add the desired width of the scrollbar as
// well // well
nsIScrollableFrame* scrollFrame = nsIScrollableFrame* scrollFrame = popupFrame->GetScrollFrame(popupFrame);
do_QueryFrame(popupFrame->PrincipalChildList().FirstChild());
nscoord scrollbarWidth = 0; nscoord scrollbarWidth = 0;
if (scrollFrame) { if (scrollFrame) {
scrollbarWidth = scrollbarWidth =

3
layout/xul/nsMenuPopupFrame.cpp
Просмотреть файл

@ -1048,8 +1048,7 @@ nsPoint nsMenuPopupFrame::AdjustPositionForAnchorAlign(nsRect& anchorRect,
nsIFrame* selectedItemFrame = GetSelectedItemForAlignment(); nsIFrame* selectedItemFrame = GetSelectedItemForAlignment();
if (selectedItemFrame) { if (selectedItemFrame) {
int32_t scrolly = 0; int32_t scrolly = 0;
nsIScrollableFrame* scrollframe = nsIScrollableFrame* scrollframe = GetScrollFrame(this);
do_QueryFrame(nsBox::GetChildXULBox(this));
if (scrollframe) { if (scrollframe) {
scrolly = scrollframe->GetScrollPosition().y; scrolly = scrollframe->GetScrollPosition().y;
} }

2
third_party/rust/proc-macro2/.cargo-checksum.json поставляемый
Просмотреть файл

@ -1 +1 @@
{"files":{"Cargo.toml":"d271b6306e4b9e51b642d67ca9c35f6f32d582eb549da89085799aadc9bcc626","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"261fb7bbe050bbff8a8e33da68926b44cd1bbd2b1e8b655d19ae681b8fff3c6e","src/lib.rs":"b7483dd58c6defa21d68d163eeae8d03029fed83e96071edaacae3f694f2bd04","src/stable.rs":"c325eadc1f0a78c55117589e6bacb72dd295ccd02cb3e2dea13e1381ad2e972e","src/strnom.rs":"807c377bdb49b8b1c67d013089b8ff33fe93ffd3fa36b6440dbb1d6fe8cd9c17","src/unstable.rs":"a18f0fdb7c0670b73663dc708962959176ae5b1c2623e7f36c3767ed9c3bcfef","tests/test.rs":"428f4298e16a23db8f8fbb6101a30e993f08dc0befa2d95439dcefb364d7a7cf"},"package":"cccdc7557a98fe98453030f077df7f3a042052fae465bb61d2c2c41435cfd9b6"} {"files":{"Cargo.toml":"f020c87cba7dd2260861239307b2cb93e16c2bed6e2ef6c9178642b1dfcc43a3","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"538fd635d385b6a90ef4cc1e361aad717162a139e932a6192212cad8407aa8e1","build.rs":"7698abdd3087e0f3308916c37ade3349b6b000165186b80913013af18d36ecb6","src/lib.rs":"c5c276236d828189a5151c890a66f2b7d1c02beca98f08f2d9c01166df441eb2","src/stable.rs":"a1f29e850e5fc4c602ee1204847124e266087175695d77ec448016db910acb6b","src/strnom.rs":"807c377bdb49b8b1c67d013089b8ff33fe93ffd3fa36b6440dbb1d6fe8cd9c17","src/unstable.rs":"0b7f86862d8254104330d14837ea6ec89e7b3bf2ffe910b73629269f2bc282de","tests/marker.rs":"0227d07bbc7f2e2ad34662a6acb65668b7dc2f79141c4faa672703a04e27bea0","tests/test.rs":"427821bab498926aa56bfcea7d28c36fb24a7d63d7f59d3e7e097bcfc77fe95b"},"package":"77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"}

11
third_party/rust/proc-macro2/Cargo.toml поставляемый
Просмотреть файл

@ -12,8 +12,9 @@
[package] [package]
name = "proc-macro2" name = "proc-macro2"
version = "0.4.9" version = "0.4.24"
authors = ["Alex Crichton <alex@alexcrichton.com>"] authors = ["Alex Crichton <alex@alexcrichton.com>"]
build = "build.rs"
description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n" description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n"
homepage = "https://github.com/alexcrichton/proc-macro2" homepage = "https://github.com/alexcrichton/proc-macro2"
documentation = "https://docs.rs/proc-macro2" documentation = "https://docs.rs/proc-macro2"
@ -22,14 +23,16 @@ keywords = ["macros"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
repository = "https://github.com/alexcrichton/proc-macro2" repository = "https://github.com/alexcrichton/proc-macro2"
[package.metadata.docs.rs] [package.metadata.docs.rs]
rustc-args = ["--cfg", "procmacro2_semver_exempt"]
rustdoc-args = ["--cfg", "procmacro2_semver_exempt"] rustdoc-args = ["--cfg", "procmacro2_semver_exempt"]
[lib]
doctest = false
[dependencies.unicode-xid] [dependencies.unicode-xid]
version = "0.1" version = "0.1"
[dev-dependencies.quote]
version = "0.6"
[features] [features]
default = ["proc-macro"] default = ["proc-macro"]
nightly = ["proc-macro"] nightly = ["proc-macro"]
proc-macro = [] proc-macro = []
[badges.travis-ci]
repository = "alexcrichton/proc-macro2"

32
third_party/rust/proc-macro2/README.md поставляемый
Просмотреть файл

@ -5,25 +5,20 @@
[![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/proc-macro2) [![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/proc-macro2)
A small shim over the `proc_macro` crate in the compiler intended to multiplex A small shim over the `proc_macro` crate in the compiler intended to multiplex
the current stable interface (as of 2017-07-05) and the [upcoming richer the stable interface as of 1.15.0 and the interface as of 1.30.0.
interface][upcoming].
[upcoming]: https://github.com/rust-lang/rust/pull/40939 New features added in Rust 1.30.0 include:
The upcoming support has features like:
* Span information on tokens * Span information on tokens
* No need to go in/out through strings * No need to go in/out through strings
* Structured input/output * Structured input/output
The hope is that libraries ported to `proc_macro2` will be trivial to port to Libraries ported to `proc_macro2` can retain support for older compilers while
the real `proc_macro` crate once the support on nightly is stabilized. continuing to get all the nice benefits of using a 1.30.0+ compiler.
## Usage ## Usage
This crate by default compiles on the stable version of the compiler. It only This crate compiles on all 1.15.0+ stable compilers and usage looks like:
uses the stable surface area of the `proc_macro` crate upstream in the compiler
itself. Usage is done via:
```toml ```toml
[dependencies] [dependencies]
@ -48,23 +43,13 @@ pub fn my_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
} }
``` ```
If you'd like you can enable the `nightly` feature in this crate. This will The 1.30.0 compiler is automatically detected and its interfaces are used when
cause it to compile against the **unstable and nightly-only** features of the available.
`proc_macro` crate. This in turn requires a nightly compiler. This should help
preserve span information, however, coming in from the compiler itself.
You can enable this feature via:
```toml
[dependencies]
proc-macro2 = { version = "0.4", features = ["nightly"] }
```
## Unstable Features ## Unstable Features
`proc-macro2` supports exporting some methods from `proc_macro` which are `proc-macro2` supports exporting some methods from `proc_macro` which are
currently highly unstable, and may not be stabilized in the first pass of currently highly unstable, and are not stabilized in the first pass of
`proc_macro` stabilizations. These features are not exported by default. Minor `proc_macro` stabilizations. These features are not exported by default. Minor
versions of `proc-macro2` may make breaking changes to them at any time. versions of `proc-macro2` may make breaking changes to them at any time.
@ -79,7 +64,6 @@ Note that this must not only be done for your crate, but for any crate that
depends on your crate. This infectious nature is intentional, as it serves as a depends on your crate. This infectious nature is intentional, as it serves as a
reminder that you are outside of the normal semver guarantees. reminder that you are outside of the normal semver guarantees.
# License # License
This project is licensed under either of This project is licensed under either of

67
third_party/rust/proc-macro2/build.rs поставляемый Normal file
Просмотреть файл

@ -0,0 +1,67 @@
use std::env;
use std::process::Command;
use std::str;
fn main() {
println!("cargo:rerun-if-changed=build.rs");
let target = env::var("TARGET").unwrap();
let minor = match rustc_minor_version() {
Some(n) => n,
None => return,
};
if minor >= 26 {
println!("cargo:rustc-cfg=u128");
}
if !enable_use_proc_macro(&target) {
return;
}
println!("cargo:rustc-cfg=use_proc_macro");
// Rust 1.29 stabilized the necessary APIs in the `proc_macro` crate
if (minor >= 29 && !cfg!(procmacro2_semver_exempt)) || cfg!(feature = "nightly") {
println!("cargo:rustc-cfg=wrap_proc_macro");
if cfg!(procmacro2_semver_exempt) {
println!("cargo:rustc-cfg=super_unstable");
// https://github.com/alexcrichton/proc-macro2/issues/147
println!("cargo:rustc-cfg=procmacro2_semver_exempt");
}
}
if minor == 29 {
println!("cargo:rustc-cfg=slow_extend");
}
}
fn enable_use_proc_macro(target: &str) -> bool {
// wasm targets don't have the `proc_macro` crate, disable this feature.
if target.contains("wasm32") {
return false;
}
// Otherwise, only enable it if our feature is actually enabled.
cfg!(feature = "proc-macro")
}
fn rustc_minor_version() -> Option<u32> {
macro_rules! otry {
($e:expr) => {
match $e {
Some(e) => e,
None => return None,
}
};
}
let rustc = otry!(env::var_os("RUSTC"));
let output = otry!(Command::new(rustc).arg("--version").output().ok());
let version = otry!(str::from_utf8(&output.stdout).ok());
let mut pieces = version.split('.');
if pieces.next() != Some("rustc 1") {
return None;
}
otry!(pieces.next()).parse().ok()
}

168
third_party/rust/proc-macro2/src/lib.rs поставляемый
Просмотреть файл

@ -43,10 +43,13 @@
//! [ts]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html //! [ts]: https://doc.rust-lang.org/proc_macro/struct.TokenStream.html
// Proc-macro2 types in rustdoc of other crates get linked to here. // Proc-macro2 types in rustdoc of other crates get linked to here.
#![doc(html_root_url = "https://docs.rs/proc-macro2/0.4.9")] #![doc(html_root_url = "https://docs.rs/proc-macro2/0.4.24")]
#![cfg_attr(feature = "nightly", feature(proc_macro_raw_ident, proc_macro_span))] #![cfg_attr(
super_unstable,
feature(proc_macro_raw_ident, proc_macro_span, proc_macro_def_site)
)]
#[cfg(feature = "proc-macro")] #[cfg(use_proc_macro)]
extern crate proc_macro; extern crate proc_macro;
extern crate unicode_xid; extern crate unicode_xid;
@ -55,6 +58,8 @@ use std::fmt;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::iter::FromIterator; use std::iter::FromIterator;
use std::marker; use std::marker;
#[cfg(procmacro2_semver_exempt)]
use std::path::PathBuf;
use std::rc::Rc; use std::rc::Rc;
use std::str::FromStr; use std::str::FromStr;
@ -62,10 +67,10 @@ use std::str::FromStr;
mod strnom; mod strnom;
mod stable; mod stable;
#[cfg(not(feature = "nightly"))] #[cfg(not(wrap_proc_macro))]
use stable as imp; use stable as imp;
#[path = "unstable.rs"] #[path = "unstable.rs"]
#[cfg(feature = "nightly")] #[cfg(wrap_proc_macro)]
mod imp; mod imp;
/// An abstract stream of tokens, or more concretely a sequence of token trees. /// An abstract stream of tokens, or more concretely a sequence of token trees.
@ -146,14 +151,14 @@ impl FromStr for TokenStream {
} }
} }
#[cfg(feature = "proc-macro")] #[cfg(use_proc_macro)]
impl From<proc_macro::TokenStream> for TokenStream { impl From<proc_macro::TokenStream> for TokenStream {
fn from(inner: proc_macro::TokenStream) -> TokenStream { fn from(inner: proc_macro::TokenStream) -> TokenStream {
TokenStream::_new(inner.into()) TokenStream::_new(inner.into())
} }
} }
#[cfg(feature = "proc-macro")] #[cfg(use_proc_macro)]
impl From<TokenStream> for proc_macro::TokenStream { impl From<TokenStream> for proc_macro::TokenStream {
fn from(inner: TokenStream) -> proc_macro::TokenStream { fn from(inner: TokenStream) -> proc_macro::TokenStream {
inner.inner.into() inner.inner.into()
@ -166,12 +171,24 @@ impl Extend<TokenTree> for TokenStream {
} }
} }
impl Extend<TokenStream> for TokenStream {
fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
self.inner
.extend(streams.into_iter().map(|stream| stream.inner))
}
}
/// Collects a number of token trees into a single stream. /// Collects a number of token trees into a single stream.
impl FromIterator<TokenTree> for TokenStream { impl FromIterator<TokenTree> for TokenStream {
fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self { fn from_iter<I: IntoIterator<Item = TokenTree>>(streams: I) -> Self {
TokenStream::_new(streams.into_iter().collect()) TokenStream::_new(streams.into_iter().collect())
} }
} }
impl FromIterator<TokenStream> for TokenStream {
fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
TokenStream::_new(streams.into_iter().map(|i| i.inner).collect())
}
}
/// Prints the token stream as a string that is supposed to be losslessly /// Prints the token stream as a string that is supposed to be losslessly
/// convertible back into the same token stream (modulo spans), except for /// convertible back into the same token stream (modulo spans), except for
@ -196,19 +213,25 @@ impl fmt::Debug for LexError {
} }
} }
// Returned by reference, so we can't easily wrap it.
#[cfg(procmacro2_semver_exempt)]
pub use imp::FileName;
/// The source file of a given `Span`. /// The source file of a given `Span`.
/// ///
/// This type is semver exempt and not exposed by default. /// This type is semver exempt and not exposed by default.
#[cfg(procmacro2_semver_exempt)] #[cfg(procmacro2_semver_exempt)]
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
pub struct SourceFile(imp::SourceFile); pub struct SourceFile {
inner: imp::SourceFile,
_marker: marker::PhantomData<Rc<()>>,
}
#[cfg(procmacro2_semver_exempt)] #[cfg(procmacro2_semver_exempt)]
impl SourceFile { impl SourceFile {
fn _new(inner: imp::SourceFile) -> Self {
SourceFile {
inner: inner,
_marker: marker::PhantomData,
}
}
/// Get the path to this source file. /// Get the path to this source file.
/// ///
/// ### Note /// ### Note
@ -222,28 +245,21 @@ impl SourceFile {
/// may not actually be valid. /// may not actually be valid.
/// ///
/// [`is_real`]: #method.is_real /// [`is_real`]: #method.is_real
pub fn path(&self) -> &FileName { pub fn path(&self) -> PathBuf {
self.0.path() self.inner.path()
} }
/// Returns `true` if this source file is a real source file, and not /// Returns `true` if this source file is a real source file, and not
/// generated by an external macro's expansion. /// generated by an external macro's expansion.
pub fn is_real(&self) -> bool { pub fn is_real(&self) -> bool {
self.0.is_real() self.inner.is_real()
}
}
#[cfg(procmacro2_semver_exempt)]
impl AsRef<FileName> for SourceFile {
fn as_ref(&self) -> &FileName {
self.0.path()
} }
} }
#[cfg(procmacro2_semver_exempt)] #[cfg(procmacro2_semver_exempt)]
impl fmt::Debug for SourceFile { impl fmt::Debug for SourceFile {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.0.fmt(f) self.inner.fmt(f)
} }
} }
@ -318,7 +334,8 @@ impl Span {
} }
/// This method is only available when the `"nightly"` feature is enabled. /// This method is only available when the `"nightly"` feature is enabled.
#[cfg(all(feature = "nightly", feature = "proc-macro"))] #[doc(hidden)]
#[cfg(any(feature = "nightly", super_unstable))]
pub fn unstable(self) -> proc_macro::Span { pub fn unstable(self) -> proc_macro::Span {
self.inner.unstable() self.inner.unstable()
} }
@ -328,7 +345,7 @@ impl Span {
/// This method is semver exempt and not exposed by default. /// This method is semver exempt and not exposed by default.
#[cfg(procmacro2_semver_exempt)] #[cfg(procmacro2_semver_exempt)]
pub fn source_file(&self) -> SourceFile { pub fn source_file(&self) -> SourceFile {
SourceFile(self.inner.source_file()) SourceFile::_new(self.inner.source_file())
} }
/// Get the starting line/column in the source file for this span. /// Get the starting line/column in the source file for this span.
@ -486,9 +503,7 @@ impl fmt::Debug for TokenTree {
/// `Delimiter`s. /// `Delimiter`s.
#[derive(Clone)] #[derive(Clone)]
pub struct Group { pub struct Group {
delimiter: Delimiter, inner: imp::Group,
stream: TokenStream,
span: Span,
} }
/// Describes how a sequence of token trees is delimited. /// Describes how a sequence of token trees is delimited.
@ -511,6 +526,18 @@ pub enum Delimiter {
} }
impl Group { impl Group {
fn _new(inner: imp::Group) -> Self {
Group {
inner: inner,
}
}
fn _new_stable(inner: stable::Group) -> Self {
Group {
inner: inner.into(),
}
}
/// Creates a new `Group` with the given delimiter and token stream. /// Creates a new `Group` with the given delimiter and token stream.
/// ///
/// This constructor will set the span for this group to /// This constructor will set the span for this group to
@ -518,15 +545,13 @@ impl Group {
/// method below. /// method below.
pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group { pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
Group { Group {
delimiter: delimiter, inner: imp::Group::new(delimiter, stream.inner),
stream: stream,
span: Span::call_site(),
} }
} }
/// Returns the delimiter of this `Group` /// Returns the delimiter of this `Group`
pub fn delimiter(&self) -> Delimiter { pub fn delimiter(&self) -> Delimiter {
self.delimiter self.inner.delimiter()
} }
/// Returns the `TokenStream` of tokens that are delimited in this `Group`. /// Returns the `TokenStream` of tokens that are delimited in this `Group`.
@ -534,13 +559,40 @@ impl Group {
/// Note that the returned token stream does not include the delimiter /// Note that the returned token stream does not include the delimiter
/// returned above. /// returned above.
pub fn stream(&self) -> TokenStream { pub fn stream(&self) -> TokenStream {
self.stream.clone() TokenStream::_new(self.inner.stream())
} }
/// Returns the span for the delimiters of this token stream, spanning the /// Returns the span for the delimiters of this token stream, spanning the
/// entire `Group`. /// entire `Group`.
///
/// ```text
/// pub fn span(&self) -> Span {
/// ^^^^^^^
/// ```
pub fn span(&self) -> Span { pub fn span(&self) -> Span {
self.span Span::_new(self.inner.span())
}
/// Returns the span pointing to the opening delimiter of this group.
///
/// ```text
/// pub fn span_open(&self) -> Span {
/// ^
/// ```
#[cfg(procmacro2_semver_exempt)]
pub fn span_open(&self) -> Span {
Span::_new(self.inner.span_open())
}
/// Returns the span pointing to the closing delimiter of this group.
///
/// ```text
/// pub fn span_close(&self) -> Span {
/// ^
/// ```
#[cfg(procmacro2_semver_exempt)]
pub fn span_close(&self) -> Span {
Span::_new(self.inner.span_close())
} }
/// Configures the span for this `Group`'s delimiters, but not its internal /// Configures the span for this `Group`'s delimiters, but not its internal
@ -550,7 +602,7 @@ impl Group {
/// by this group, but rather it will only set the span of the delimiter /// by this group, but rather it will only set the span of the delimiter
/// tokens at the level of the `Group`. /// tokens at the level of the `Group`.
pub fn set_span(&mut self, span: Span) { pub fn set_span(&mut self, span: Span) {
self.span = span; self.inner.set_span(span.inner)
} }
} }
@ -558,30 +610,14 @@ impl Group {
/// into the same group (modulo spans), except for possibly `TokenTree::Group`s /// into the same group (modulo spans), except for possibly `TokenTree::Group`s
/// with `Delimiter::None` delimiters. /// with `Delimiter::None` delimiters.
impl fmt::Display for Group { impl fmt::Display for Group {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
let (left, right) = match self.delimiter { fmt::Display::fmt(&self.inner, formatter)
Delimiter::Parenthesis => ("(", ")"),
Delimiter::Brace => ("{", "}"),
Delimiter::Bracket => ("[", "]"),
Delimiter::None => ("", ""),
};
f.write_str(left)?;
self.stream.fmt(f)?;
f.write_str(right)?;
Ok(())
} }
} }
impl fmt::Debug for Group { impl fmt::Debug for Group {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
let mut debug = fmt.debug_struct("Group"); fmt::Debug::fmt(&self.inner, formatter)
debug.field("delimiter", &self.delimiter);
debug.field("stream", &self.stream);
#[cfg(procmacro2_semver_exempt)]
debug.field("span", &self.span);
debug.finish()
} }
} }
@ -679,11 +715,11 @@ impl fmt::Debug for Punct {
/// - A lifetime is not an identifier. Use `syn::Lifetime` instead. /// - A lifetime is not an identifier. Use `syn::Lifetime` instead.
/// ///
/// An identifier constructed with `Ident::new` is permitted to be a Rust /// An identifier constructed with `Ident::new` is permitted to be a Rust
/// keyword, though parsing one through its [`Synom`] implementation rejects /// keyword, though parsing one through its [`Parse`] implementation rejects
/// Rust keywords. Use `call!(Ident::parse_any)` when parsing to match the /// Rust keywords. Use `input.call(Ident::parse_any)` when parsing to match the
/// behaviour of `Ident::new`. /// behaviour of `Ident::new`.
/// ///
/// [`Synom`]: https://docs.rs/syn/0.14/syn/synom/trait.Synom.html /// [`Parse`]: https://docs.rs/syn/0.15/syn/parse/trait.Parse.html
/// ///
/// # Examples /// # Examples
/// ///
@ -811,7 +847,7 @@ impl Ident {
impl PartialEq for Ident { impl PartialEq for Ident {
fn eq(&self, other: &Ident) -> bool { fn eq(&self, other: &Ident) -> bool {
self.to_string() == other.to_string() self.inner == other.inner
} }
} }
@ -820,7 +856,7 @@ where
T: ?Sized + AsRef<str>, T: ?Sized + AsRef<str>,
{ {
fn eq(&self, other: &T) -> bool { fn eq(&self, other: &T) -> bool {
self.to_string() == other.as_ref() self.inner == other
} }
} }
@ -938,6 +974,12 @@ impl Literal {
isize_suffixed => isize, isize_suffixed => isize,
} }
#[cfg(u128)]
suffixed_int_literals! {
u128_suffixed => u128,
i128_suffixed => i128,
}
unsuffixed_int_literals! { unsuffixed_int_literals! {
u8_unsuffixed => u8, u8_unsuffixed => u8,
u16_unsuffixed => u16, u16_unsuffixed => u16,
@ -951,6 +993,12 @@ impl Literal {
isize_unsuffixed => isize, isize_unsuffixed => isize,
} }
#[cfg(u128)]
unsuffixed_int_literals! {
u128_unsuffixed => u128,
i128_unsuffixed => i128,
}
pub fn f64_unsuffixed(f: f64) -> Literal { pub fn f64_unsuffixed(f: f64) -> Literal {
assert!(f.is_finite()); assert!(f.is_finite());
Literal::_new(imp::Literal::f64_unsuffixed(f)) Literal::_new(imp::Literal::f64_unsuffixed(f))

168
third_party/rust/proc-macro2/src/stable.rs поставляемый
Просмотреть файл

@ -6,13 +6,16 @@ use std::cell::RefCell;
use std::cmp; use std::cmp;
use std::fmt; use std::fmt;
use std::iter; use std::iter;
#[cfg(procmacro2_semver_exempt)]
use std::path::Path;
use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use std::vec; use std::vec;
use strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult}; use strnom::{block_comment, skip_whitespace, whitespace, word_break, Cursor, PResult};
use unicode_xid::UnicodeXID; use unicode_xid::UnicodeXID;
use {Delimiter, Group, Punct, Spacing, TokenTree}; use {Delimiter, Punct, Spacing, TokenTree};
#[derive(Clone)] #[derive(Clone)]
pub struct TokenStream { pub struct TokenStream {
@ -116,7 +119,7 @@ impl fmt::Debug for TokenStream {
} }
} }
#[cfg(feature = "proc-macro")] #[cfg(use_proc_macro)]
impl From<::proc_macro::TokenStream> for TokenStream { impl From<::proc_macro::TokenStream> for TokenStream {
fn from(inner: ::proc_macro::TokenStream) -> TokenStream { fn from(inner: ::proc_macro::TokenStream) -> TokenStream {
inner inner
@ -126,7 +129,7 @@ impl From<::proc_macro::TokenStream> for TokenStream {
} }
} }
#[cfg(feature = "proc-macro")] #[cfg(use_proc_macro)]
impl From<TokenStream> for ::proc_macro::TokenStream { impl From<TokenStream> for ::proc_macro::TokenStream {
fn from(inner: TokenStream) -> ::proc_macro::TokenStream { fn from(inner: TokenStream) -> ::proc_macro::TokenStream {
inner inner
@ -154,12 +157,31 @@ impl iter::FromIterator<TokenTree> for TokenStream {
} }
} }
impl iter::FromIterator<TokenStream> for TokenStream {
fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
let mut v = Vec::new();
for stream in streams.into_iter() {
v.extend(stream.inner);
}
TokenStream { inner: v }
}
}
impl Extend<TokenTree> for TokenStream { impl Extend<TokenTree> for TokenStream {
fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) { fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
self.inner.extend(streams); self.inner.extend(streams);
} }
} }
impl Extend<TokenStream> for TokenStream {
fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
self.inner
.extend(streams.into_iter().flat_map(|stream| stream));
}
}
pub type TokenTreeIter = vec::IntoIter<TokenTree>; pub type TokenTreeIter = vec::IntoIter<TokenTree>;
impl IntoIterator for TokenStream { impl IntoIterator for TokenStream {
@ -171,29 +193,15 @@ impl IntoIterator for TokenStream {
} }
} }
#[derive(Clone, PartialEq, Eq, Debug)]
pub struct FileName(String);
#[allow(dead_code)]
pub fn file_name(s: String) -> FileName {
FileName(s)
}
impl fmt::Display for FileName {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.0.fmt(f)
}
}
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
pub struct SourceFile { pub struct SourceFile {
name: FileName, path: PathBuf,
} }
impl SourceFile { impl SourceFile {
/// Get the path to this source file as a string. /// Get the path to this source file as a string.
pub fn path(&self) -> &FileName { pub fn path(&self) -> PathBuf {
&self.name self.path.clone()
} }
pub fn is_real(&self) -> bool { pub fn is_real(&self) -> bool {
@ -202,12 +210,6 @@ impl SourceFile {
} }
} }
impl AsRef<FileName> for SourceFile {
fn as_ref(&self) -> &FileName {
self.path()
}
}
impl fmt::Debug for SourceFile { impl fmt::Debug for SourceFile {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("SourceFile") f.debug_struct("SourceFile")
@ -363,7 +365,7 @@ impl Span {
let cm = cm.borrow(); let cm = cm.borrow();
let fi = cm.fileinfo(*self); let fi = cm.fileinfo(*self);
SourceFile { SourceFile {
name: FileName(fi.name.clone()), path: Path::new(&fi.name).to_owned(),
} }
}) })
} }
@ -412,6 +414,75 @@ impl fmt::Debug for Span {
} }
} }
#[derive(Clone)]
pub struct Group {
delimiter: Delimiter,
stream: TokenStream,
span: Span,
}
impl Group {
pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
Group {
delimiter: delimiter,
stream: stream,
span: Span::call_site(),
}
}
pub fn delimiter(&self) -> Delimiter {
self.delimiter
}
pub fn stream(&self) -> TokenStream {
self.stream.clone()
}
pub fn span(&self) -> Span {
self.span
}
pub fn span_open(&self) -> Span {
self.span
}
pub fn span_close(&self) -> Span {
self.span
}
pub fn set_span(&mut self, span: Span) {
self.span = span;
}
}
impl fmt::Display for Group {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let (left, right) = match self.delimiter {
Delimiter::Parenthesis => ("(", ")"),
Delimiter::Brace => ("{", "}"),
Delimiter::Bracket => ("[", "]"),
Delimiter::None => ("", ""),
};
f.write_str(left)?;
self.stream.fmt(f)?;
f.write_str(right)?;
Ok(())
}
}
impl fmt::Debug for Group {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let mut debug = fmt.debug_struct("Group");
debug.field("delimiter", &self.delimiter);
debug.field("stream", &self.stream);
#[cfg(procmacro2_semver_exempt)]
debug.field("span", &self.span);
debug.finish()
}
}
#[derive(Clone)] #[derive(Clone)]
pub struct Ident { pub struct Ident {
sym: String, sym: String,
@ -493,6 +564,26 @@ fn validate_term(string: &str) {
} }
} }
impl PartialEq for Ident {
fn eq(&self, other: &Ident) -> bool {
self.sym == other.sym && self.raw == other.raw
}
}
impl<T> PartialEq<T> for Ident
where
T: ?Sized + AsRef<str>,
{
fn eq(&self, other: &T) -> bool {
let other = other.as_ref();
if self.raw {
other.starts_with("r#") && self.sym == other[2..]
} else {
self.sym == other
}
}
}
impl fmt::Display for Ident { impl fmt::Display for Ident {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.raw { if self.raw {
@ -570,6 +661,12 @@ impl Literal {
f64_suffixed => f64, f64_suffixed => f64,
} }
#[cfg(u128)]
suffixed_numbers! {
u128_suffixed => u128,
i128_suffixed => i128,
}
unsuffixed_numbers! { unsuffixed_numbers! {
u8_unsuffixed => u8, u8_unsuffixed => u8,
u16_unsuffixed => u16, u16_unsuffixed => u16,
@ -583,6 +680,12 @@ impl Literal {
isize_unsuffixed => isize, isize_unsuffixed => isize,
} }
#[cfg(u128)]
unsuffixed_numbers! {
u128_unsuffixed => u128,
i128_unsuffixed => i128,
}
pub fn f32_unsuffixed(f: f32) -> Literal { pub fn f32_unsuffixed(f: f32) -> Literal {
let mut s = f.to_string(); let mut s = f.to_string();
if !s.contains(".") { if !s.contains(".") {
@ -708,7 +811,7 @@ fn token_tree(input: Cursor) -> PResult<TokenTree> {
} }
named!(token_kind -> TokenTree, alt!( named!(token_kind -> TokenTree, alt!(
map!(group, TokenTree::Group) map!(group, |g| TokenTree::Group(::Group::_new_stable(g)))
| |
map!(literal, |l| TokenTree::Literal(::Literal::_new_stable(l))) // must be before symbol map!(literal, |l| TokenTree::Literal(::Literal::_new_stable(l))) // must be before symbol
| |
@ -722,19 +825,19 @@ named!(group -> Group, alt!(
punct!("("), punct!("("),
token_stream, token_stream,
punct!(")") punct!(")")
) => { |ts| Group::new(Delimiter::Parenthesis, ::TokenStream::_new_stable(ts)) } ) => { |ts| Group::new(Delimiter::Parenthesis, ts) }
| |
delimited!( delimited!(
punct!("["), punct!("["),
token_stream, token_stream,
punct!("]") punct!("]")
) => { |ts| Group::new(Delimiter::Bracket, ::TokenStream::_new_stable(ts)) } ) => { |ts| Group::new(Delimiter::Bracket, ts) }
| |
delimited!( delimited!(
punct!("{"), punct!("{"),
token_stream, token_stream,
punct!("}") punct!("}")
) => { |ts| Group::new(Delimiter::Brace, ::TokenStream::_new_stable(ts)) } ) => { |ts| Group::new(Delimiter::Brace, ts) }
)); ));
fn symbol_leading_ws(input: Cursor) -> PResult<TokenTree> { fn symbol_leading_ws(input: Cursor) -> PResult<TokenTree> {
@ -1249,7 +1352,8 @@ fn doc_comment(input: Cursor) -> PResult<Vec<TokenTree>> {
for tt in stream.iter_mut() { for tt in stream.iter_mut() {
tt.set_span(span); tt.set_span(span);
} }
trees.push(Group::new(Delimiter::Bracket, stream.into_iter().collect()).into()); let group = Group::new(Delimiter::Bracket, stream.into_iter().collect());
trees.push(::Group::_new_stable(group).into());
for tt in trees.iter_mut() { for tt in trees.iter_mut() {
tt.set_span(span); tt.set_span(span);
} }

382
third_party/rust/proc-macro2/src/unstable.rs поставляемый
Просмотреть файл

@ -1,14 +1,16 @@
#![cfg_attr(not(procmacro2_semver_exempt), allow(dead_code))] #![cfg_attr(not(super_unstable), allow(dead_code))]
use std::fmt; use std::fmt;
use std::iter; use std::iter;
use std::panic; use std::panic::{self, PanicInfo};
#[cfg(super_unstable)]
use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use proc_macro; use proc_macro;
use stable; use stable;
use {Delimiter, Group, Punct, Spacing, TokenTree}; use {Delimiter, Punct, Spacing, TokenTree};
#[derive(Clone)] #[derive(Clone)]
pub enum TokenStream { pub enum TokenStream {
@ -23,16 +25,59 @@ pub enum LexError {
fn nightly_works() -> bool { fn nightly_works() -> bool {
use std::sync::atomic::*; use std::sync::atomic::*;
use std::sync::Once;
static WORKS: AtomicUsize = ATOMIC_USIZE_INIT; static WORKS: AtomicUsize = ATOMIC_USIZE_INIT;
static INIT: Once = Once::new();
match WORKS.load(Ordering::SeqCst) { match WORKS.load(Ordering::SeqCst) {
1 => return false, 1 => return false,
2 => return true, 2 => return true,
_ => {} _ => {}
} }
let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
WORKS.store(works as usize + 1, Ordering::SeqCst); // Swap in a null panic hook to avoid printing "thread panicked" to stderr,
works // then use catch_unwind to determine whether the compiler's proc_macro is
// working. When proc-macro2 is used from outside of a procedural macro all
// of the proc_macro crate's APIs currently panic.
//
// The Once is to prevent the possibility of this ordering:
//
// thread 1 calls take_hook, gets the user's original hook
// thread 1 calls set_hook with the null hook
// thread 2 calls take_hook, thinks null hook is the original hook
// thread 2 calls set_hook with the null hook
// thread 1 calls set_hook with the actual original hook
// thread 2 calls set_hook with what it thinks is the original hook
//
// in which the user's hook has been lost.
//
// There is still a race condition where a panic in a different thread can
// happen during the interval that the user's original panic hook is
// unregistered such that their hook is incorrectly not called. This is
// sufficiently unlikely and less bad than printing panic messages to stderr
// on correct use of this crate. Maybe there is a libstd feature request
// here. For now, if a user needs to guarantee that this failure mode does
// not occur, they need to call e.g. `proc_macro2::Span::call_site()` from
// the main thread before launching any other threads.
INIT.call_once(|| {
type PanicHook = Fn(&PanicInfo) + Sync + Send + 'static;
let null_hook: Box<PanicHook> = Box::new(|_panic_info| { /* ignore */ });
let sanity_check = &*null_hook as *const PanicHook;
let original_hook = panic::take_hook();
panic::set_hook(null_hook);
let works = panic::catch_unwind(|| proc_macro::Span::call_site()).is_ok();
WORKS.store(works as usize + 1, Ordering::SeqCst);
let hopefully_null_hook = panic::take_hook();
panic::set_hook(original_hook);
if sanity_check != &*hopefully_null_hook {
panic!("observed race condition in proc_macro2::nightly_works");
}
});
nightly_works()
} }
fn mismatch() -> ! { fn mismatch() -> ! {
@ -61,6 +106,13 @@ impl TokenStream {
TokenStream::Stable(_) => mismatch(), TokenStream::Stable(_) => mismatch(),
} }
} }
fn unwrap_stable(self) -> stable::TokenStream {
match self {
TokenStream::Nightly(_) => mismatch(),
TokenStream::Stable(s) => s,
}
}
} }
impl FromStr for TokenStream { impl FromStr for TokenStream {
@ -111,18 +163,7 @@ impl From<TokenTree> for TokenStream {
return TokenStream::Stable(token.into()); return TokenStream::Stable(token.into());
} }
let tt: proc_macro::TokenTree = match token { let tt: proc_macro::TokenTree = match token {
TokenTree::Group(tt) => { TokenTree::Group(tt) => tt.inner.unwrap_nightly().into(),
let delim = match tt.delimiter() {
Delimiter::Parenthesis => proc_macro::Delimiter::Parenthesis,
Delimiter::Bracket => proc_macro::Delimiter::Bracket,
Delimiter::Brace => proc_macro::Delimiter::Brace,
Delimiter::None => proc_macro::Delimiter::None,
};
let span = tt.span();
let mut group = proc_macro::Group::new(delim, tt.stream.inner.unwrap_nightly());
group.set_span(span.inner.unwrap_nightly());
group.into()
}
TokenTree::Punct(tt) => { TokenTree::Punct(tt) => {
let spacing = match tt.spacing() { let spacing = match tt.spacing() {
Spacing::Joint => proc_macro::Spacing::Joint, Spacing::Joint => proc_macro::Spacing::Joint,
@ -156,29 +197,108 @@ impl iter::FromIterator<TokenTree> for TokenStream {
} }
} }
impl iter::FromIterator<TokenStream> for TokenStream {
fn from_iter<I: IntoIterator<Item = TokenStream>>(streams: I) -> Self {
let mut streams = streams.into_iter();
match streams.next() {
#[cfg(slow_extend)]
Some(TokenStream::Nightly(first)) => {
let stream = iter::once(first).chain(streams.map(|s| {
match s {
TokenStream::Nightly(s) => s,
TokenStream::Stable(_) => mismatch(),
}
})).collect();
TokenStream::Nightly(stream)
}
#[cfg(not(slow_extend))]
Some(TokenStream::Nightly(mut first)) => {
first.extend(streams.map(|s| {
match s {
TokenStream::Nightly(s) => s,
TokenStream::Stable(_) => mismatch(),
}
}));
TokenStream::Nightly(first)
}
Some(TokenStream::Stable(mut first)) => {
first.extend(streams.map(|s| {
match s {
TokenStream::Stable(s) => s,
TokenStream::Nightly(_) => mismatch(),
}
}));
TokenStream::Stable(first)
}
None => TokenStream::new(),
}
}
}
impl Extend<TokenTree> for TokenStream { impl Extend<TokenTree> for TokenStream {
fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) { fn extend<I: IntoIterator<Item = TokenTree>>(&mut self, streams: I) {
match self { match self {
TokenStream::Nightly(tts) => { TokenStream::Nightly(tts) => {
*tts = tts #[cfg(not(slow_extend))]
.clone() {
.into_iter() tts.extend(
.chain(
streams streams
.into_iter() .into_iter()
.map(TokenStream::from) .map(|t| TokenStream::from(t).unwrap_nightly()),
.flat_map(|t| match t { );
TokenStream::Nightly(tts) => tts.into_iter(), }
_ => panic!(), #[cfg(slow_extend)]
}), {
) *tts = tts
.collect(); .clone()
.into_iter()
.chain(
streams
.into_iter()
.map(TokenStream::from)
.flat_map(|t| match t {
TokenStream::Nightly(tts) => tts.into_iter(),
_ => mismatch(),
}),
).collect();
}
} }
TokenStream::Stable(tts) => tts.extend(streams), TokenStream::Stable(tts) => tts.extend(streams),
} }
} }
} }
impl Extend<TokenStream> for TokenStream {
fn extend<I: IntoIterator<Item = TokenStream>>(&mut self, streams: I) {
match self {
TokenStream::Nightly(tts) => {
#[cfg(not(slow_extend))]
{
tts.extend(streams.into_iter().map(|stream| stream.unwrap_nightly()));
}
#[cfg(slow_extend)]
{
*tts = tts
.clone()
.into_iter()
.chain(
streams
.into_iter()
.flat_map(|t| match t {
TokenStream::Nightly(tts) => tts.into_iter(),
_ => mismatch(),
}),
).collect();
}
}
TokenStream::Stable(tts) => {
tts.extend(streams.into_iter().map(|stream| stream.unwrap_stable()))
}
}
}
}
impl fmt::Debug for TokenStream { impl fmt::Debug for TokenStream {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
@ -235,18 +355,7 @@ impl Iterator for TokenTreeIter {
TokenTreeIter::Stable(iter) => return iter.next(), TokenTreeIter::Stable(iter) => return iter.next(),
}; };
Some(match token { Some(match token {
proc_macro::TokenTree::Group(tt) => { proc_macro::TokenTree::Group(tt) => ::Group::_new(Group::Nightly(tt)).into(),
let delim = match tt.delimiter() {
proc_macro::Delimiter::Parenthesis => Delimiter::Parenthesis,
proc_macro::Delimiter::Bracket => Delimiter::Bracket,
proc_macro::Delimiter::Brace => Delimiter::Brace,
proc_macro::Delimiter::None => Delimiter::None,
};
let stream = ::TokenStream::_new(TokenStream::Nightly(tt.stream()));
let mut g = Group::new(delim, stream);
g.set_span(::Span::_new(Span::Nightly(tt.span())));
g.into()
}
proc_macro::TokenTree::Punct(tt) => { proc_macro::TokenTree::Punct(tt) => {
let spacing = match tt.spacing() { let spacing = match tt.spacing() {
proc_macro::Spacing::Joint => Spacing::Joint, proc_macro::Spacing::Joint => Spacing::Joint,
@ -275,48 +384,40 @@ impl fmt::Debug for TokenTreeIter {
} }
} }
pub use stable::FileName;
// NOTE: We have to generate our own filename object here because we can't wrap
// the one provided by proc_macro.
#[derive(Clone, PartialEq, Eq)] #[derive(Clone, PartialEq, Eq)]
#[cfg(super_unstable)]
pub enum SourceFile { pub enum SourceFile {
Nightly(proc_macro::SourceFile, FileName), Nightly(proc_macro::SourceFile),
Stable(stable::SourceFile), Stable(stable::SourceFile),
} }
#[cfg(super_unstable)]
impl SourceFile { impl SourceFile {
fn nightly(sf: proc_macro::SourceFile) -> Self { fn nightly(sf: proc_macro::SourceFile) -> Self {
let filename = stable::file_name(sf.path().display().to_string()); SourceFile::Nightly(sf)
SourceFile::Nightly(sf, filename)
} }
/// Get the path to this source file as a string. /// Get the path to this source file as a string.
pub fn path(&self) -> &FileName { pub fn path(&self) -> PathBuf {
match self { match self {
SourceFile::Nightly(_, f) => f, SourceFile::Nightly(a) => a.path(),
SourceFile::Stable(a) => a.path(), SourceFile::Stable(a) => a.path(),
} }
} }
pub fn is_real(&self) -> bool { pub fn is_real(&self) -> bool {
match self { match self {
SourceFile::Nightly(a, _) => a.is_real(), SourceFile::Nightly(a) => a.is_real(),
SourceFile::Stable(a) => a.is_real(), SourceFile::Stable(a) => a.is_real(),
} }
} }
} }
impl AsRef<FileName> for SourceFile { #[cfg(super_unstable)]
fn as_ref(&self) -> &FileName {
self.path()
}
}
impl fmt::Debug for SourceFile { impl fmt::Debug for SourceFile {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
SourceFile::Nightly(a, _) => a.fmt(f), SourceFile::Nightly(a) => a.fmt(f),
SourceFile::Stable(a) => a.fmt(f), SourceFile::Stable(a) => a.fmt(f),
} }
} }
@ -342,6 +443,7 @@ impl Span {
} }
} }
#[cfg(super_unstable)]
pub fn def_site() -> Span { pub fn def_site() -> Span {
if nightly_works() { if nightly_works() {
Span::Nightly(proc_macro::Span::def_site()) Span::Nightly(proc_macro::Span::def_site())
@ -350,6 +452,7 @@ impl Span {
} }
} }
#[cfg(super_unstable)]
pub fn resolved_at(&self, other: Span) -> Span { pub fn resolved_at(&self, other: Span) -> Span {
match (self, other) { match (self, other) {
(Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.resolved_at(b)), (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.resolved_at(b)),
@ -358,6 +461,7 @@ impl Span {
} }
} }
#[cfg(super_unstable)]
pub fn located_at(&self, other: Span) -> Span { pub fn located_at(&self, other: Span) -> Span {
match (self, other) { match (self, other) {
(Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.located_at(b)), (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.located_at(b)),
@ -373,7 +477,7 @@ impl Span {
} }
} }
#[cfg(procmacro2_semver_exempt)] #[cfg(super_unstable)]
pub fn source_file(&self) -> SourceFile { pub fn source_file(&self) -> SourceFile {
match self { match self {
Span::Nightly(s) => SourceFile::nightly(s.source_file()), Span::Nightly(s) => SourceFile::nightly(s.source_file()),
@ -381,7 +485,7 @@ impl Span {
} }
} }
#[cfg(procmacro2_semver_exempt)] #[cfg(super_unstable)]
pub fn start(&self) -> LineColumn { pub fn start(&self) -> LineColumn {
match self { match self {
Span::Nightly(s) => { Span::Nightly(s) => {
@ -395,7 +499,7 @@ impl Span {
} }
} }
#[cfg(procmacro2_semver_exempt)] #[cfg(super_unstable)]
pub fn end(&self) -> LineColumn { pub fn end(&self) -> LineColumn {
match self { match self {
Span::Nightly(s) => { Span::Nightly(s) => {
@ -409,7 +513,7 @@ impl Span {
} }
} }
#[cfg(procmacro2_semver_exempt)] #[cfg(super_unstable)]
pub fn join(&self, other: Span) -> Option<Span> { pub fn join(&self, other: Span) -> Option<Span> {
let ret = match (self, other) { let ret = match (self, other) {
(Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.join(b)?), (Span::Nightly(a), Span::Nightly(b)) => Span::Nightly(a.join(b)?),
@ -419,6 +523,7 @@ impl Span {
Some(ret) Some(ret)
} }
#[cfg(super_unstable)]
pub fn eq(&self, other: &Span) -> bool { pub fn eq(&self, other: &Span) -> bool {
match (self, other) { match (self, other) {
(Span::Nightly(a), Span::Nightly(b)) => a.eq(b), (Span::Nightly(a), Span::Nightly(b)) => a.eq(b),
@ -456,6 +561,112 @@ impl fmt::Debug for Span {
} }
} }
#[derive(Clone)]
pub enum Group {
Nightly(proc_macro::Group),
Stable(stable::Group),
}
impl Group {
pub fn new(delimiter: Delimiter, stream: TokenStream) -> Group {
match stream {
TokenStream::Nightly(stream) => {
let delimiter = match delimiter {
Delimiter::Parenthesis => proc_macro::Delimiter::Parenthesis,
Delimiter::Bracket => proc_macro::Delimiter::Bracket,
Delimiter::Brace => proc_macro::Delimiter::Brace,
Delimiter::None => proc_macro::Delimiter::None,
};
Group::Nightly(proc_macro::Group::new(delimiter, stream))
}
TokenStream::Stable(stream) => {
Group::Stable(stable::Group::new(delimiter, stream))
}
}
}
pub fn delimiter(&self) -> Delimiter {
match self {
Group::Nightly(g) => match g.delimiter() {
proc_macro::Delimiter::Parenthesis => Delimiter::Parenthesis,
proc_macro::Delimiter::Bracket => Delimiter::Bracket,
proc_macro::Delimiter::Brace => Delimiter::Brace,
proc_macro::Delimiter::None => Delimiter::None,
}
Group::Stable(g) => g.delimiter(),
}
}
pub fn stream(&self) -> TokenStream {
match self {
Group::Nightly(g) => TokenStream::Nightly(g.stream()),
Group::Stable(g) => TokenStream::Stable(g.stream()),
}
}
pub fn span(&self) -> Span {
match self {
Group::Nightly(g) => Span::Nightly(g.span()),
Group::Stable(g) => Span::Stable(g.span()),
}
}
#[cfg(super_unstable)]
pub fn span_open(&self) -> Span {
match self {
Group::Nightly(g) => Span::Nightly(g.span_open()),
Group::Stable(g) => Span::Stable(g.span_open()),
}
}
#[cfg(super_unstable)]
pub fn span_close(&self) -> Span {
match self {
Group::Nightly(g) => Span::Nightly(g.span_close()),
Group::Stable(g) => Span::Stable(g.span_close()),
}
}
pub fn set_span(&mut self, span: Span) {
match (self, span) {
(Group::Nightly(g), Span::Nightly(s)) => g.set_span(s),
(Group::Stable(g), Span::Stable(s)) => g.set_span(s),
_ => mismatch(),
}
}
fn unwrap_nightly(self) -> proc_macro::Group {
match self {
Group::Nightly(g) => g,
Group::Stable(_) => mismatch(),
}
}
}
impl From<stable::Group> for Group {
fn from(g: stable::Group) -> Self {
Group::Stable(g)
}
}
impl fmt::Display for Group {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self {
Group::Nightly(group) => group.fmt(formatter),
Group::Stable(group) => group.fmt(formatter),
}
}
}
impl fmt::Debug for Group {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self {
Group::Nightly(group) => group.fmt(formatter),
Group::Stable(group) => group.fmt(formatter),
}
}
}
#[derive(Clone)] #[derive(Clone)]
pub enum Ident { pub enum Ident {
Nightly(proc_macro::Ident), Nightly(proc_macro::Ident),
@ -472,7 +683,17 @@ impl Ident {
pub fn new_raw(string: &str, span: Span) -> Ident { pub fn new_raw(string: &str, span: Span) -> Ident {
match span { match span {
Span::Nightly(s) => Ident::Nightly(proc_macro::Ident::new_raw(string, s)), Span::Nightly(s) => {
let p: proc_macro::TokenStream = string.parse().unwrap();
let ident = match p.into_iter().next() {
Some(proc_macro::TokenTree::Ident(mut i)) => {
i.set_span(s);
i
}
_ => panic!(),
};
Ident::Nightly(ident)
}
Span::Stable(s) => Ident::Stable(stable::Ident::new_raw(string, s)), Span::Stable(s) => Ident::Stable(stable::Ident::new_raw(string, s)),
} }
} }
@ -500,6 +721,29 @@ impl Ident {
} }
} }
impl PartialEq for Ident {
fn eq(&self, other: &Ident) -> bool {
match (self, other) {
(Ident::Nightly(t), Ident::Nightly(o)) => t.to_string() == o.to_string(),
(Ident::Stable(t), Ident::Stable(o)) => t == o,
_ => mismatch(),
}
}
}
impl<T> PartialEq<T> for Ident
where
T: ?Sized + AsRef<str>,
{
fn eq(&self, other: &T) -> bool {
let other = other.as_ref();
match self {
Ident::Nightly(t) => t.to_string() == other,
Ident::Stable(t) => t == other,
}
}
}
impl fmt::Display for Ident { impl fmt::Display for Ident {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
@ -565,6 +809,12 @@ impl Literal {
f64_suffixed => f64, f64_suffixed => f64,
} }
#[cfg(u128)]
suffixed_numbers! {
i128_suffixed => i128,
u128_suffixed => u128,
}
unsuffixed_integers! { unsuffixed_integers! {
u8_unsuffixed => u8, u8_unsuffixed => u8,
u16_unsuffixed => u16, u16_unsuffixed => u16,
@ -578,6 +828,12 @@ impl Literal {
isize_unsuffixed => isize, isize_unsuffixed => isize,
} }
#[cfg(u128)]
unsuffixed_integers! {
i128_unsuffixed => i128,
u128_unsuffixed => u128,
}
pub fn f32_unsuffixed(f: f32) -> Literal { pub fn f32_unsuffixed(f: f32) -> Literal {
if nightly_works() { if nightly_works() {
Literal::Nightly(proc_macro::Literal::f32_unsuffixed(f)) Literal::Nightly(proc_macro::Literal::f32_unsuffixed(f))

61
third_party/rust/proc-macro2/tests/marker.rs поставляемый Normal file
Просмотреть файл

@ -0,0 +1,61 @@
extern crate proc_macro2;
use proc_macro2::*;
macro_rules! assert_impl {
($ty:ident is $($marker:ident) and +) => {
#[test]
#[allow(non_snake_case)]
fn $ty() {
fn assert_implemented<T: $($marker +)+>() {}
assert_implemented::<$ty>();
}
};
($ty:ident is not $($marker:ident) or +) => {
#[test]
#[allow(non_snake_case)]
fn $ty() {
$(
{
// Implemented for types that implement $marker.
trait IsNotImplemented {
fn assert_not_implemented() {}
}
impl<T: $marker> IsNotImplemented for T {}
// Implemented for the type being tested.
trait IsImplemented {
fn assert_not_implemented() {}
}
impl IsImplemented for $ty {}
// If $ty does not implement $marker, there is no ambiguity
// in the following trait method call.
<$ty>::assert_not_implemented();
}
)+
}
};
}
assert_impl!(Delimiter is Send and Sync);
assert_impl!(Spacing is Send and Sync);
assert_impl!(Group is not Send or Sync);
assert_impl!(Ident is not Send or Sync);
assert_impl!(LexError is not Send or Sync);
assert_impl!(Literal is not Send or Sync);
assert_impl!(Punct is not Send or Sync);
assert_impl!(Span is not Send or Sync);
assert_impl!(TokenStream is not Send or Sync);
assert_impl!(TokenTree is not Send or Sync);
#[cfg(procmacro2_semver_exempt)]
mod semver_exempt {
use super::*;
assert_impl!(LineColumn is Send and Sync);
assert_impl!(SourceFile is not Send or Sync);
}

2
third_party/rust/proc-macro2/tests/test.rs поставляемый
Просмотреть файл

@ -203,7 +203,7 @@ fn default_span() {
assert_eq!(end.line, 1); assert_eq!(end.line, 1);
assert_eq!(end.column, 0); assert_eq!(end.column, 0);
let source_file = Span::call_site().source_file(); let source_file = Span::call_site().source_file();
assert_eq!(source_file.path().to_string(), "<unspecified>"); assert_eq!(source_file.path().to_string_lossy(), "<unspecified>");
assert!(!source_file.is_real()); assert!(!source_file.is_real());
} }

2
third_party/rust/quote/.cargo-checksum.json поставляемый
Просмотреть файл

@ -1 +1 @@
{"files":{"Cargo.toml":"33e512b1a2fd40b4d0b5af4ac16ad4f163e0383ba2f4abcd7a7e575e2af3442c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"61dc7827fb2e29185f0d73594db326bfdbec8393ca7a48429b259711d42e80f9","src/ext.rs":"2e2f71fca8c8580eeed138da42d93dc21fc48d7a8da973ae6d3b616da6a3b0e3","src/lib.rs":"0dedf7935a0203324804cecdf6350245caa24dbdaaf9e168b7ab90b0883ec0c4","src/to_tokens.rs":"10dc32fbe69798408ee1f49ec25770b90eeb6b069552f50cd4e03228b8e85847","tests/test.rs":"90fe0e9a704e628339fe9298f0cb8307e94ebadfe28fffd7b2fc2d94203bc342"},"package":"e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035"} {"files":{"Cargo.toml":"44cf9d3a28be1b21f4247572b6ca4d38dc3fd42fa84c4a4e0e5632aa27bee083","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"b43ef9b9c61628f8de7036271e61322cba23d878d056748e571f4f6cf9fba1b1","src/ext.rs":"a2def0b0f24c822b3f936a781c347e5f6fdc75120f85874c94f5e7eb708168c2","src/lib.rs":"f1ba768690c57252e8135ee474a20bdd513fd0bd0664e9e9b697800163f39d08","src/to_tokens.rs":"86c419a72017846ef33a0acc53caee7312c750c90b3f1d3b58e33f20efcb94f4","tests/conditional/integer128.rs":"d83e21a91efbaa801a82ae499111bdda2d31edaa620e78c0199eba42d69c9ee6","tests/test.rs":"810013d7fd77b738abd0ace90ce2f2f3e219c757652eabab29bc1c0ce4a73b24"},"package":"53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"}

7
third_party/rust/quote/Cargo.toml поставляемый
Просмотреть файл

@ -12,19 +12,22 @@
[package] [package]
name = "quote" name = "quote"
version = "0.6.3" version = "0.6.10"
authors = ["David Tolnay <dtolnay@gmail.com>"] authors = ["David Tolnay <dtolnay@gmail.com>"]
include = ["Cargo.toml", "src/**/*.rs", "tests/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"] include = ["Cargo.toml", "src/**/*.rs", "tests/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
description = "Quasi-quoting macro quote!(...)" description = "Quasi-quoting macro quote!(...)"
documentation = "https://docs.rs/quote/" documentation = "https://docs.rs/quote/"
readme = "README.md" readme = "README.md"
keywords = ["syn"] keywords = ["syn"]
categories = ["development-tools::procedural-macro-helpers"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
repository = "https://github.com/dtolnay/quote" repository = "https://github.com/dtolnay/quote"
[dependencies.proc-macro2] [dependencies.proc-macro2]
version = "0.4.4" version = "0.4.21"
default-features = false default-features = false
[features] [features]
default = ["proc-macro"] default = ["proc-macro"]
proc-macro = ["proc-macro2/proc-macro"] proc-macro = ["proc-macro2/proc-macro"]
[badges.travis-ci]
repository = "dtolnay/quote"

4
third_party/rust/quote/README.md поставляемый
Просмотреть файл

@ -68,11 +68,11 @@ let tokens = quote! {
} }
impl #generics serde::Serialize for SerializeWith #generics #where_clause { impl #generics serde::Serialize for SerializeWith #generics #where_clause {
fn serialize<S>(&self, s: &mut S) -> Result<(), S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
S: serde::Serializer, S: serde::Serializer,
{ {
#path(self.value, s) #path(self.value, serializer)
} }
} }

4
third_party/rust/quote/src/ext.rs поставляемый
Просмотреть файл

@ -1,5 +1,7 @@
use super::ToTokens; use super::ToTokens;
use std::iter;
use proc_macro2::{TokenStream, TokenTree}; use proc_macro2::{TokenStream, TokenTree};
/// TokenStream extension trait with methods for appending tokens. /// TokenStream extension trait with methods for appending tokens.
@ -36,7 +38,7 @@ impl TokenStreamExt for TokenStream {
where where
U: Into<TokenTree>, U: Into<TokenTree>,
{ {
self.extend(Some(token.into())); self.extend(iter::once(token.into()));
} }
/// For use by `ToTokens` implementations. /// For use by `ToTokens` implementations.

399
third_party/rust/quote/src/lib.rs поставляемый
Просмотреть файл

@ -67,11 +67,11 @@
//! } //! }
//! //!
//! impl #generics serde::Serialize for SerializeWith #generics #where_clause { //! impl #generics serde::Serialize for SerializeWith #generics #where_clause {
//! fn serialize<S>(&self, s: &mut S) -> Result<(), S::Error> //! fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
//! where //! where
//! S: serde::Serializer, //! S: serde::Serializer,
//! { //! {
//! #path(self.value, s) //! #path(self.value, serializer)
//! } //! }
//! } //! }
//! //!
@ -92,9 +92,12 @@
//! An even higher limit may be necessary for especially large invocations. //! An even higher limit may be necessary for especially large invocations.
// Quote types in rustdoc of other crates get linked to here. // Quote types in rustdoc of other crates get linked to here.
#![doc(html_root_url = "https://docs.rs/quote/0.6.3")] #![doc(html_root_url = "https://docs.rs/quote/0.6.10")]
#[cfg(feature = "proc-macro")] #[cfg(all(
not(all(target_arch = "wasm32", target_os = "unknown")),
feature = "proc-macro"
))]
extern crate proc_macro; extern crate proc_macro;
extern crate proc_macro2; extern crate proc_macro2;
@ -107,17 +110,128 @@ pub use to_tokens::ToTokens;
// Not public API. // Not public API.
#[doc(hidden)] #[doc(hidden)]
pub mod __rt { pub mod __rt {
// Not public API. use ext::TokenStreamExt;
pub use proc_macro2::*; pub use proc_macro2::*;
// Not public API. fn is_ident_start(c: u8) -> bool {
pub fn parse(tokens: &mut TokenStream, span: Span, s: &str) { (b'a' <= c && c <= b'z') || (b'A' <= c && c <= b'Z') || c == b'_'
let s: TokenStream = s.parse().expect("invalid token stream");
tokens.extend(s.into_iter().map(|mut t| {
t.set_span(span);
t
}));
} }
fn is_ident_continue(c: u8) -> bool {
(b'a' <= c && c <= b'z')
|| (b'A' <= c && c <= b'Z')
|| c == b'_'
|| (b'0' <= c && c <= b'9')
}
fn is_ident(token: &str) -> bool {
if token.bytes().all(|digit| digit >= b'0' && digit <= b'9') {
return false;
}
let mut bytes = token.bytes();
let first = bytes.next().unwrap();
if !is_ident_start(first) {
return false;
}
for ch in bytes {
if !is_ident_continue(ch) {
return false;
}
}
true
}
pub fn parse(tokens: &mut TokenStream, span: Span, s: &str) {
if is_ident(s) {
// Fast path, since idents are the most common token.
tokens.append(Ident::new(s, span));
} else {
let s: TokenStream = s.parse().expect("invalid token stream");
tokens.extend(s.into_iter().map(|mut t| {
t.set_span(span);
t
}));
}
}
macro_rules! push_punct {
($name:ident $char1:tt) => {
pub fn $name(tokens: &mut TokenStream, span: Span) {
let mut punct = Punct::new($char1, Spacing::Alone);
punct.set_span(span);
tokens.append(punct);
}
};
($name:ident $char1:tt $char2:tt) => {
pub fn $name(tokens: &mut TokenStream, span: Span) {
let mut punct = Punct::new($char1, Spacing::Joint);
punct.set_span(span);
tokens.append(punct);
let mut punct = Punct::new($char2, Spacing::Alone);
punct.set_span(span);
tokens.append(punct);
}
};
($name:ident $char1:tt $char2:tt $char3:tt) => {
pub fn $name(tokens: &mut TokenStream, span: Span) {
let mut punct = Punct::new($char1, Spacing::Joint);
punct.set_span(span);
tokens.append(punct);
let mut punct = Punct::new($char2, Spacing::Joint);
punct.set_span(span);
tokens.append(punct);
let mut punct = Punct::new($char3, Spacing::Alone);
punct.set_span(span);
tokens.append(punct);
}
};
}
push_punct!(push_add '+');
push_punct!(push_add_eq '+' '=');
push_punct!(push_and '&');
push_punct!(push_and_and '&' '&');
push_punct!(push_and_eq '&' '=');
push_punct!(push_at '@');
push_punct!(push_bang '!');
push_punct!(push_caret '^');
push_punct!(push_caret_eq '^' '=');
push_punct!(push_colon ':');
push_punct!(push_colon2 ':' ':');
push_punct!(push_comma ',');
push_punct!(push_div '/');
push_punct!(push_div_eq '/' '=');
push_punct!(push_dot '.');
push_punct!(push_dot2 '.' '.');
push_punct!(push_dot3 '.' '.' '.');
push_punct!(push_dot_dot_eq '.' '.' '=');
push_punct!(push_eq '=');
push_punct!(push_eq_eq '=' '=');
push_punct!(push_ge '>' '=');
push_punct!(push_gt '>');
push_punct!(push_le '<' '=');
push_punct!(push_lt '<');
push_punct!(push_mul_eq '*' '=');
push_punct!(push_ne '!' '=');
push_punct!(push_or '|');
push_punct!(push_or_eq '|' '=');
push_punct!(push_or_or '|' '|');
push_punct!(push_pound '#');
push_punct!(push_question '?');
push_punct!(push_rarrow '-' '>');
push_punct!(push_larrow '<' '-');
push_punct!(push_rem '%');
push_punct!(push_rem_eq '%' '=');
push_punct!(push_fat_arrow '=' '>');
push_punct!(push_semi ';');
push_punct!(push_shl '<' '<');
push_punct!(push_shl_eq '<' '<' '=');
push_punct!(push_shr '>' '>');
push_punct!(push_shr_eq '>' '>' '=');
push_punct!(push_star '*');
push_punct!(push_sub '-');
push_punct!(push_sub_eq '-' '=');
} }
/// The whole point. /// The whole point.
@ -132,10 +246,13 @@ pub mod __rt {
/// ///
/// Variable interpolation is done with `#var` (similar to `$var` in /// Variable interpolation is done with `#var` (similar to `$var` in
/// `macro_rules!` macros). This grabs the `var` variable that is currently in /// `macro_rules!` macros). This grabs the `var` variable that is currently in
/// scope and inserts it in that location in the output tokens. The variable /// scope and inserts it in that location in the output tokens. Any type
/// must implement the [`ToTokens`] trait. /// implementing the [`ToTokens`] trait can be interpolated. This includes most
/// Rust primitive types as well as most of the syntax tree types from the [Syn]
/// crate.
/// ///
/// [`ToTokens`]: trait.ToTokens.html /// [`ToTokens`]: trait.ToTokens.html
/// [Syn]: https://github.com/dtolnay/syn
/// ///
/// Repetition is done using `#(...)*` or `#(...),*` again similar to /// Repetition is done using `#(...)*` or `#(...),*` again similar to
/// `macro_rules!`. This iterates through the elements of any variable /// `macro_rules!`. This iterates through the elements of any variable
@ -200,7 +317,7 @@ pub mod __rt {
/// # /// #
/// # fn main() {} /// # fn main() {}
/// ``` /// ```
#[macro_export] #[macro_export(local_inner_macros)]
macro_rules! quote { macro_rules! quote {
($($tt:tt)*) => (quote_spanned!($crate::__rt::Span::call_site()=> $($tt)*)); ($($tt:tt)*) => (quote_spanned!($crate::__rt::Span::call_site()=> $($tt)*));
} }
@ -309,7 +426,7 @@ macro_rules! quote {
/// site. If we resolve `Sync` at the same span that the user's type is going to /// site. If we resolve `Sync` at the same span that the user's type is going to
/// be resolved, then they could bypass our check by defining their own trait /// be resolved, then they could bypass our check by defining their own trait
/// named `Sync` that is implemented for their type. /// named `Sync` that is implemented for their type.
#[macro_export] #[macro_export(local_inner_macros)]
macro_rules! quote_spanned { macro_rules! quote_spanned {
($span:expr=> $($tt:tt)*) => { ($span:expr=> $($tt:tt)*) => {
{ {
@ -325,7 +442,7 @@ macro_rules! quote_spanned {
// //
// in: pounded_var_names!(then () a #b c #( #d )* #e) // in: pounded_var_names!(then () a #b c #( #d )* #e)
// out: then!(() b d e) // out: then!(() b d e)
#[macro_export] #[macro_export(local_inner_macros)]
#[doc(hidden)] #[doc(hidden)]
macro_rules! pounded_var_names { macro_rules! pounded_var_names {
($finish:ident ($($found:ident)*) # ( $($inner:tt)* ) $($rest:tt)*) => { ($finish:ident ($($found:ident)*) # ( $($inner:tt)* ) $($rest:tt)*) => {
@ -370,7 +487,7 @@ macro_rules! pounded_var_names {
// //
// in: nested_tuples_pat!(() a) // in: nested_tuples_pat!(() a)
// out: a // out: a
#[macro_export] #[macro_export(local_inner_macros)]
#[doc(hidden)] #[doc(hidden)]
macro_rules! nested_tuples_pat { macro_rules! nested_tuples_pat {
(()) => { (()) => {
@ -395,7 +512,7 @@ macro_rules! nested_tuples_pat {
// //
// in: multi_zip_iter!(() a) // in: multi_zip_iter!(() a)
// out: a // out: a
#[macro_export] #[macro_export(local_inner_macros)]
#[doc(hidden)] #[doc(hidden)]
macro_rules! multi_zip_expr { macro_rules! multi_zip_expr {
(()) => { (()) => {
@ -419,7 +536,7 @@ macro_rules! multi_zip_expr {
}; };
} }
#[macro_export] #[macro_export(local_inner_macros)]
#[doc(hidden)] #[doc(hidden)]
macro_rules! quote_each_token { macro_rules! quote_each_token {
($tokens:ident $span:ident) => {}; ($tokens:ident $span:ident) => {};
@ -454,7 +571,7 @@ macro_rules! quote_each_token {
$tokens.extend({ $tokens.extend({
let mut g = $crate::__rt::Group::new( let mut g = $crate::__rt::Group::new(
$crate::__rt::Delimiter::Bracket, $crate::__rt::Delimiter::Bracket,
quote_spanned!($span=> $($inner)*).into(), quote_spanned!($span=> $($inner)*),
); );
g.set_span($span); g.set_span($span);
Some($crate::__rt::TokenTree::from(g)) Some($crate::__rt::TokenTree::from(g))
@ -471,7 +588,7 @@ macro_rules! quote_each_token {
$tokens.extend({ $tokens.extend({
let mut g = $crate::__rt::Group::new( let mut g = $crate::__rt::Group::new(
$crate::__rt::Delimiter::Parenthesis, $crate::__rt::Delimiter::Parenthesis,
quote_spanned!($span=> $($first)*).into(), quote_spanned!($span=> $($first)*),
); );
g.set_span($span); g.set_span($span);
Some($crate::__rt::TokenTree::from(g)) Some($crate::__rt::TokenTree::from(g))
@ -483,7 +600,7 @@ macro_rules! quote_each_token {
$tokens.extend({ $tokens.extend({
let mut g = $crate::__rt::Group::new( let mut g = $crate::__rt::Group::new(
$crate::__rt::Delimiter::Bracket, $crate::__rt::Delimiter::Bracket,
quote_spanned!($span=> $($first)*).into(), quote_spanned!($span=> $($first)*),
); );
g.set_span($span); g.set_span($span);
Some($crate::__rt::TokenTree::from(g)) Some($crate::__rt::TokenTree::from(g))
@ -495,7 +612,7 @@ macro_rules! quote_each_token {
$tokens.extend({ $tokens.extend({
let mut g = $crate::__rt::Group::new( let mut g = $crate::__rt::Group::new(
$crate::__rt::Delimiter::Brace, $crate::__rt::Delimiter::Brace,
quote_spanned!($span=> $($first)*).into(), quote_spanned!($span=> $($first)*),
); );
g.set_span($span); g.set_span($span);
Some($crate::__rt::TokenTree::from(g)) Some($crate::__rt::TokenTree::from(g))
@ -503,9 +620,239 @@ macro_rules! quote_each_token {
quote_each_token!($tokens $span $($rest)*); quote_each_token!($tokens $span $($rest)*);
}; };
($tokens:ident $span:ident + $($rest:tt)*) => {
$crate::__rt::push_add(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident += $($rest:tt)*) => {
$crate::__rt::push_add_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident & $($rest:tt)*) => {
$crate::__rt::push_and(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident && $($rest:tt)*) => {
$crate::__rt::push_and_and(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident &= $($rest:tt)*) => {
$crate::__rt::push_and_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident @ $($rest:tt)*) => {
$crate::__rt::push_at(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ! $($rest:tt)*) => {
$crate::__rt::push_bang(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ^ $($rest:tt)*) => {
$crate::__rt::push_caret(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ^= $($rest:tt)*) => {
$crate::__rt::push_caret_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident : $($rest:tt)*) => {
$crate::__rt::push_colon(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident :: $($rest:tt)*) => {
$crate::__rt::push_colon2(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident , $($rest:tt)*) => {
$crate::__rt::push_comma(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident / $($rest:tt)*) => {
$crate::__rt::push_div(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident /= $($rest:tt)*) => {
$crate::__rt::push_div_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident . $($rest:tt)*) => {
$crate::__rt::push_dot(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident .. $($rest:tt)*) => {
$crate::__rt::push_dot2(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ... $($rest:tt)*) => {
$crate::__rt::push_dot3(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ..= $($rest:tt)*) => {
$crate::__rt::push_dot_dot_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident = $($rest:tt)*) => {
$crate::__rt::push_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident == $($rest:tt)*) => {
$crate::__rt::push_eq_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident >= $($rest:tt)*) => {
$crate::__rt::push_ge(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident > $($rest:tt)*) => {
$crate::__rt::push_gt(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident <= $($rest:tt)*) => {
$crate::__rt::push_le(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident < $($rest:tt)*) => {
$crate::__rt::push_lt(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident *= $($rest:tt)*) => {
$crate::__rt::push_mul_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident != $($rest:tt)*) => {
$crate::__rt::push_ne(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident | $($rest:tt)*) => {
$crate::__rt::push_or(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident |= $($rest:tt)*) => {
$crate::__rt::push_or_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident || $($rest:tt)*) => {
$crate::__rt::push_or_or(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident # $($rest:tt)*) => {
$crate::__rt::push_pound(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ? $($rest:tt)*) => {
$crate::__rt::push_question(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident -> $($rest:tt)*) => {
$crate::__rt::push_rarrow(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident <- $($rest:tt)*) => {
$crate::__rt::push_larrow(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident % $($rest:tt)*) => {
$crate::__rt::push_rem(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident %= $($rest:tt)*) => {
$crate::__rt::push_rem_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident => $($rest:tt)*) => {
$crate::__rt::push_fat_arrow(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident ; $($rest:tt)*) => {
$crate::__rt::push_semi(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident << $($rest:tt)*) => {
$crate::__rt::push_shl(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident <<= $($rest:tt)*) => {
$crate::__rt::push_shl_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident >> $($rest:tt)*) => {
$crate::__rt::push_shr(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident >>= $($rest:tt)*) => {
$crate::__rt::push_shr_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident * $($rest:tt)*) => {
$crate::__rt::push_star(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident - $($rest:tt)*) => {
$crate::__rt::push_sub(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident -= $($rest:tt)*) => {
$crate::__rt::push_sub_eq(&mut $tokens, $span);
quote_each_token!($tokens $span $($rest)*);
};
($tokens:ident $span:ident $first:tt $($rest:tt)*) => { ($tokens:ident $span:ident $first:tt $($rest:tt)*) => {
// TODO: this seems slow... special case some `:tt` arguments? $crate::__rt::parse(&mut $tokens, $span, quote_stringify!($first));
$crate::__rt::parse(&mut $tokens, $span, stringify!($first));
quote_each_token!($tokens $span $($rest)*); quote_each_token!($tokens $span $($rest)*);
}; };
} }
// Unhygienically invoke whatever `stringify` the caller has in scope i.e. not a
// local macro. The macros marked `local_inner_macros` above cannot invoke
// `stringify` directly.
#[macro_export]
#[doc(hidden)]
macro_rules! quote_stringify {
($tt:tt) => {
stringify!($tt)
};
}

15
third_party/rust/quote/src/to_tokens.rs поставляемый
Просмотреть файл

@ -1,6 +1,7 @@
use super::TokenStreamExt; use super::TokenStreamExt;
use std::borrow::Cow; use std::borrow::Cow;
use std::iter;
use proc_macro2::{Group, Ident, Literal, Punct, Span, TokenStream, TokenTree}; use proc_macro2::{Group, Ident, Literal, Punct, Span, TokenStream, TokenTree};
@ -77,6 +78,12 @@ impl<'a, T: ?Sized + ToTokens> ToTokens for &'a T {
} }
} }
impl<'a, T: ?Sized + ToTokens> ToTokens for &'a mut T {
fn to_tokens(&self, tokens: &mut TokenStream) {
(**self).to_tokens(tokens);
}
}
impl<'a, T: ?Sized + ToOwned + ToTokens> ToTokens for Cow<'a, T> { impl<'a, T: ?Sized + ToOwned + ToTokens> ToTokens for Cow<'a, T> {
fn to_tokens(&self, tokens: &mut TokenStream) { fn to_tokens(&self, tokens: &mut TokenStream) {
(**self).to_tokens(tokens); (**self).to_tokens(tokens);
@ -136,6 +143,12 @@ primitive! {
f64 => f64_suffixed f64 => f64_suffixed
} }
#[cfg(integer128)]
primitive! {
i128 => i128_suffixed
u128 => u128_suffixed
}
impl ToTokens for char { impl ToTokens for char {
fn to_tokens(&self, tokens: &mut TokenStream) { fn to_tokens(&self, tokens: &mut TokenStream) {
tokens.append(Literal::character(*self)); tokens.append(Literal::character(*self));
@ -181,7 +194,7 @@ impl ToTokens for TokenTree {
impl ToTokens for TokenStream { impl ToTokens for TokenStream {
fn to_tokens(&self, dst: &mut TokenStream) { fn to_tokens(&self, dst: &mut TokenStream) {
dst.append_all(self.clone().into_iter()); dst.extend(iter::once(self.clone()));
} }
fn into_token_stream(self) -> TokenStream { fn into_token_stream(self) -> TokenStream {

11
third_party/rust/quote/tests/conditional/integer128.rs поставляемый Normal file
Просмотреть файл

@ -0,0 +1,11 @@
#[test]
fn test_integer128() {
let ii128 = -1i128;
let uu128 = 1u128;
let tokens = quote! {
#ii128 #uu128
};
let expected = "-1i128 1u128";
assert_eq!(expected, tokens.to_string());
}

5
third_party/rust/quote/tests/test.rs поставляемый
Просмотреть файл

@ -9,6 +9,11 @@ extern crate quote;
use proc_macro2::{Ident, Span, TokenStream}; use proc_macro2::{Ident, Span, TokenStream};
use quote::TokenStreamExt; use quote::TokenStreamExt;
mod conditional {
#[cfg(integer128)]
mod integer128;
}
struct X; struct X;
impl quote::ToTokens for X { impl quote::ToTokens for X {

2
third_party/rust/syn/.cargo-checksum.json поставляемый
Просмотреть файл

@ -1 +1 @@
{"files":{"Cargo.toml":"cc823b5150d40948fb45042c1987dd8ede59ed6aa64003f622c4b901e319a218","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"f033c371492a4769d377a8bf1a139adc7bf94ea00595b867a3e234eeab994c8c","README.md":"9ca76bd182b81395755fbf0a4f1af086a46a90848f45b75210517004e751afe2","src/attr.rs":"ac161a3011bcd3381eb143e0954851fcff3e82e47075e6c9f6191ccf8ee67fee","src/buffer.rs":"a82b47bb12ec0de4159a7677712db5f4f54c145eb61aa88a1696d32cf143d50e","src/data.rs":"c34df5d623fed7a52be01fc625a4502f6ad97dc8feb25c51f7d57029dbdd91dd","src/derive.rs":"7a2246e8ee03fcbea040363d0b943daac696667ba799218231307c1b7a96aeed","src/error.rs":"93a265306ee6d265feeccb65b64e429ec6b4bb29d825cb52a319ea86e5cc1c11","src/export.rs":"39cc2468a141fb8229c9189dfe99875c278850714b1996e683a5b4cbc8aa3457","src/expr.rs":"91bab694502cebc56bdcd45219f1cf317ff857320d855e595ec2acc0f9ab781a","src/ext.rs":"4902ffc7dc25a1bb5813d5292a3df7cbf72ebad79def578c7cd231cf67e1785c","src/file.rs":"ebd350b5ff548cdbb21a0fadd5572575a216a1b0caef36dd46477ca324c7af6f","src/gen/fold.rs":"bfca5243b4694cc6a9b0d1f34ca53fa90387325fd4ee6bce024adb3ca42f4472","src/gen/visit.rs":"4d13b239db7c38a38f8ce5dfe827317ec4d35df83dd65ad5a350a3c882632bfd","src/gen/visit_mut.rs":"f5c8aea5907084c2425cdb613a07def41735c764022f7549876c9fa4c7170d5a","src/gen_helper.rs":"d128fbd24fadfc5634976bdb9188c649f9905718c9c987a2839c3e6134b155a2","src/generics.rs":"3b07bcfa970714c38c2b524da765e5b0465832d91aba9ed40b99b4aa7a7ea9c4","src/group.rs":"7faa0b3701b6e597a5766e316733cd4d88ecc2a24b54b233f33e28c23a7cbad8","src/ident.rs":"61534c48949ebfa03e948874ef64174e1c8111c3b953edd58f79748fe9e00507","src/item.rs":"897cfd8ea6f2ff1a664e2a5db84073f5ed1480318d14236c636c94608016b27c","src/keyword.rs":"0a8fd45d065c56532065f97fb097136b6f1a8efc393a0946e6a95217877616a9","src/lib.rs":"79664eb2d3570c2851c0d6e5dde4e9764619e14c5f107ff07d1416d2a15f8c1a","src/lifetime.rs":"3174a81cea3eef0ec1555900b96b1641d6d3ed3609bc17d72b02a1495377ac35","src/lit.rs":"661bf3ad4b49bc74dc808c1f1d584551689145d3c5fbadfcc28d157d5087981b","src/lookahead.rs":"07ce6d6915f24a01f86a486135eb841a3a01424148fe49ea797c5ffacf0c7673","src/mac.rs":"8a7efbdc9498612844c88660312117c401685bf300da7e91bef7effde3026019","src/macros.rs":"03d33128d9c2d2664cc2d3d158518c60cadad8b340945c6eb292fb7bd92e1b41","src/op.rs":"83bbe2199946abbf1d4a0bc6eb0d97285439f77e8e02646b8e3b707485e4301e","src/parse.rs":"248cfe3d826cf192efd5fef1b52db5075d3739e045f42157908596fc039a741b","src/parse_quote.rs":"e6f8101568d8430d6793183dfedfee01c2c479274ff7318dd221060ac140a477","src/path.rs":"e666c702d46e2849cdc37fddc2e1950659cd17611ebf988102f2bf0af72b6bd1","src/print.rs":"7ebb68123898f2ebbae12abf028747c05bea7b08f1e96b17164f1dcebdab7355","src/punctuated.rs":"01539dcb51c75e0fe0a4cdfb7716a909ce1bfd0767370c04043159a0a0dec154","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"0d9bdef967d339deae5e2229f9593f48b15af67cf1f79358aa464cacd173f32c","src/synom.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/token.rs":"40c406da738c52e52944585acc5ff36b75edb905b78cfb2bd74626663edb2c99","src/tt.rs":"6ff2559d5c5fcaa73e914cd0a4a5984ab21de7ea334f1c1498e73059d2d1f7d1","src/ty.rs":"503e0ae7da33ecd6d733aa3d14a45ced20696b9bdd52d3f9ef23fd31ec5651da"},"package":"455a6ec9b368f8c479b0ae5494d13b22dc00990d2f00d68c9dc6a2dc4f17f210"} {"files":{"Cargo.toml":"fdac1ee690fa3d33b906be9d09a8551741db11ddba7f755cb75c8d74fd2d918b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"3f3d105c0f1bae3bdb5ed3cc32a8e5a02f3de6f62a9f17f5ba03af3f813d0881","src/attr.rs":"9210a8dc5fea0ee3004b14a9e2923142932c53986b56685d62d9aa115fe093b0","src/buffer.rs":"fac77febe022ab4982078c73ca502f9d698a402b3eca0f8e9c7a2796af01e5f4","src/data.rs":"54ee54c3c650bc5e200d4bea947d6e89093a39f2444cd43e8861f5852975e0bc","src/derive.rs":"eb041b47a73bace73c2872cd9a8e190de7e2b3b57cd57213770f088ec19ab3c6","src/error.rs":"0bcf09b0892c6d5f5f31f7f758866ded1e47463833cad60694329348ac1fb44a","src/export.rs":"1f7e017dac9426e91c796445e733c390c408c808ba9c21cb7df7799b67352fde","src/expr.rs":"3fe98f69af9be770d4d549d869d35136f3dea66452e4cb4b9e387982e3b7aea2","src/ext.rs":"1881179e634681cdd472ecac502192b5a5a7759056d1c49497706749fdab1bdf","src/file.rs":"abb9f5e71a8a6b52649c15da21d3f99e25a727d87c2f87d2744ac3970c1d683f","src/gen/fold.rs":"7f7ab907e3c17b503a72707e2f8d9fc29d9139269d810ea9b6511af9de7d3080","src/gen/visit.rs":"0a4543ac9f82d8ab7ccf02c55e8325ff9b859e36ea08d3e187a4836f470eef1c","src/gen/visit_mut.rs":"66441522f544056cd464740e8ba614688a5f417857c649550eeba2b589ef6096","src/gen_helper.rs":"644b1d31987919c0239891d8f90c09f3bf541a71fb85e744438e4814cc6dff89","src/generics.rs":"6ee5bba532b95f7de7c6bbe8caadabc6a71c45e7f8d7636d823075ff27f28937","src/group.rs":"03487f75d0abd302f06e50eb09d14ab83fb60c67e1f2602be53ca3f28a833b90","src/ident.rs":"61534c48949ebfa03e948874ef64174e1c8111c3b953edd58f79748fe9e00507","src/item.rs":"6799adb332bedaa68c3801055e71a5665cc7b9c4ba53960f6b91487408e7e10c","src/keyword.rs":"7dde0b4a0d70527921be16f50f8d88e4b5ad7e5fd70e9badd2bb351fd796dfb8","src/lib.rs":"254744712dae7c30ce7f97ce4685fc6256cf125e7872397d3dd9e32632273262","src/lifetime.rs":"7912a4c77ee805e912fb28c7f434836ea82540263d549877cd5edfbe32d1bf95","src/lit.rs":"b6aef4f2787201edbeb85529fc0c333bd8083d697a08f28c812b6b2f765939f5","src/lookahead.rs":"5b3c55ae8c1b1d0ed813c296dc6fa586379a99e7792a3cb0d634ae6ca74f54b5","src/mac.rs":"a91623ed9c1de7b18ef752db79a242002e95156497a52a1790a75069915d22ee","src/macros.rs":"2f91e07a1aec4b385986c0a0f66274e8de1c1aa81f95d398a5cd364b3c451bb4","src/op.rs":"01edb1e07b6d60b266797ca4b30788b0a511452228e04073a11f0b61f106a0e7","src/parse.rs":"d907b9822943bafbcb1e005f09a145e46c162e7702fce703b57f9b7ccbdf85a2","src/parse_macro_input.rs":"8df7b4c1b361171f3fefb0490dec570ad29c024c04e35184b296725f97f2002c","src/parse_quote.rs":"d5e613fbba06900d882f2aaa042f10c1bee1b1dffaa1d9ee9a73d1e504a08fad","src/path.rs":"d6a319db75e4b34783912aed0ddfad92cdec05798d8d378f2f23231437cab3e1","src/print.rs":"7ebb68123898f2ebbae12abf028747c05bea7b08f1e96b17164f1dcebdab7355","src/punctuated.rs":"5ad6885e602cb1c79b49f11e1c739bdb7c33ecfa1ca9c709d711b0778ae48085","src/span.rs":"748c51c6feb223c26d3b1701f5bb98aee823666c775c98106cfa24fe29d8cec1","src/spanned.rs":"83b4ab1e2138ac9340eaa8234ad1d9f7468b450ddf3a852e574cac18e4f766b8","src/synom.rs":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/thread.rs":"798dd0a6cca7807f1d55c1f79cec967314a75c4e8e2cfdb5644499c22618b307","src/token.rs":"8fa7ffb89da61d5187ab0ff40de7b3b1135ace6cf770c8d84fce8371854698a9","src/tt.rs":"b3d99cbd68cd50749f26f4afa138e6366d327099ed566b30c315ccb58fa26ded","src/ty.rs":"4ac9d1b84f9bf269516348e1b923b1c8e3f7562b98ec7ef66174c31fffb8dce5"},"package":"734ecc29cd36e8123850d9bf21dfd62ef8300aaa8f879aabaa899721808be37c"}

2
third_party/rust/syn/Cargo.toml поставляемый
Просмотреть файл

@ -12,7 +12,7 @@
[package] [package]
name = "syn" name = "syn"
version = "0.15.7" version = "0.15.24"
authors = ["David Tolnay <dtolnay@gmail.com>"] authors = ["David Tolnay <dtolnay@gmail.com>"]
include = ["/Cargo.toml", "/src/**/*.rs", "/README.md", "/LICENSE-APACHE", "/LICENSE-MIT"] include = ["/Cargo.toml", "/src/**/*.rs", "/README.md", "/LICENSE-APACHE", "/LICENSE-MIT"]
description = "Parser for Rust source code" description = "Parser for Rust source code"

2
third_party/rust/syn/LICENSE-MIT поставляемый
Просмотреть файл

@ -1,5 +1,3 @@
Copyright (c) 2018 Syn Developers
Permission is hereby granted, free of charge, to any Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the documentation files (the "Software"), to deal in the

53
third_party/rust/syn/README.md поставляемый
Просмотреть файл

@ -81,12 +81,9 @@ proc-macro = true
```rust ```rust
extern crate proc_macro; extern crate proc_macro;
extern crate syn;
#[macro_use]
extern crate quote;
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::quote;
use syn::{parse_macro_input, DeriveInput}; use syn::{parse_macro_input, DeriveInput};
#[proc_macro_derive(MyMacro)] #[proc_macro_derive(MyMacro)]
@ -105,7 +102,7 @@ pub fn my_macro(input: TokenStream) -> TokenStream {
``` ```
The [`heapsize`] example directory shows a complete working Macros 1.1 The [`heapsize`] example directory shows a complete working Macros 1.1
implementation of a custom derive. It works on any Rust compiler \>=1.15.0. The implementation of a custom derive. It works on any Rust compiler 1.15+. The
example derives a `HeapSize` trait which computes an estimate of the amount of example derives a `HeapSize` trait which computes an estimate of the amount of
heap memory owned by a value. heap memory owned by a value.
@ -133,13 +130,6 @@ struct Demo<'a, T: ?Sized> {
## Spans and error reporting ## Spans and error reporting
The [`heapsize2`] example directory is an extension of the `heapsize` example
that demonstrates some of the hygiene and error reporting properties of Macros
2.0. This example currently requires a nightly Rust compiler \>=1.24.0-nightly
but we are working to stabilize all of the APIs involved.
[`heapsize2`]: examples/heapsize2
The token-based procedural macro API provides great control over where the The token-based procedural macro API provides great control over where the
compiler's error messages are displayed in user code. Consider the error the compiler's error messages are displayed in user code. Consider the error the
user sees if one of their field types does not implement `HeapSize`. user sees if one of their field types does not implement `HeapSize`.
@ -152,20 +142,8 @@ struct Broken {
} }
``` ```
In the Macros 1.1 string-based procedural macro world, the resulting error would
point unhelpfully to the invocation of the derive macro and not to the actual
problematic field.
```
error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
--> src/main.rs:4:10
|
4 | #[derive(HeapSize)]
| ^^^^^^^^
```
By tracking span information all the way through the expansion of a procedural By tracking span information all the way through the expansion of a procedural
macro as shown in the `heapsize2` example, token-based macros in Syn are able to macro as shown in the `heapsize` example, token-based macros in Syn are able to
trigger errors that directly pinpoint the source of the problem. trigger errors that directly pinpoint the source of the problem.
``` ```
@ -246,24 +224,21 @@ available.
- **`proc-macro`** *(enabled by default)* — Runtime dependency on the dynamic - **`proc-macro`** *(enabled by default)* — Runtime dependency on the dynamic
library libproc_macro from rustc toolchain. library libproc_macro from rustc toolchain.
## Nightly features ## Proc macro shim
By default Syn uses the [`proc-macro2`] crate to emulate the nightly compiler's Syn uses the [proc-macro2] crate to emulate the compiler's procedural macro API
procedural macro API in a stable way that works all the way back to Rust 1.15.0. in a stable way that works all the way back to Rust 1.15.0. This shim makes it
This shim makes it possible to write code without regard for whether the current possible to write code without regard for whether the current compiler version
compiler version supports the features we use. supports the features we use.
[`proc-macro2`]: https://github.com/alexcrichton/proc-macro2 In general all of your code should be written against proc-macro2 rather than
proc-macro. The one exception is in the signatures of procedural macro entry
points, which are required by the language to use `proc_macro::TokenStream`.
On a nightly compiler, to eliminate the stable shim and use the compiler's The proc-macro2 crate will automatically detect and use the compiler's data
`proc-macro` directly, add `proc-macro2` to your Cargo.toml and set its structures on sufficiently new compilers.
`"nightly"` feature which bypasses the stable shim.
```toml [proc-macro2]: https://github.com/alexcrichton/proc-macro2
[dependencies]
syn = "0.15"
proc-macro2 = { version = "0.4", features = ["nightly"] }
```
## License ## License

209
third_party/rust/syn/src/attr.rs поставляемый
Просмотреть файл

@ -1,17 +1,11 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use punctuated::Punctuated; use punctuated::Punctuated;
use std::iter; use std::iter;
use proc_macro2::{Delimiter, Spacing, TokenStream, TokenTree}; use proc_macro2::TokenStream;
#[cfg(not(feature = "parsing"))]
use proc_macro2::{Delimiter, Spacing, TokenTree};
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
use parse::{ParseStream, Result}; use parse::{ParseStream, Result};
@ -55,11 +49,11 @@ ast_struct! {
/// path tts path tts /// path tts path tts
/// ``` /// ```
/// ///
/// Use the [`interpret_meta`] method to try parsing the tokens of an /// Use the [`parse_meta`] method to try parsing the tokens of an attribute
/// attribute into the structured representation that is used by convention /// into the structured representation that is used by convention across
/// across most Rust libraries. /// most Rust libraries.
/// ///
/// [`interpret_meta`]: #method.interpret_meta /// [`parse_meta`]: #method.parse_meta
/// ///
/// # Parsing /// # Parsing
/// ///
@ -75,12 +69,9 @@ ast_struct! {
/// [`Attribute::parse_outer`]: #method.parse_outer /// [`Attribute::parse_outer`]: #method.parse_outer
/// [`Attribute::parse_inner`]: #method.parse_inner /// [`Attribute::parse_inner`]: #method.parse_inner
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Attribute, Ident, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{Attribute, Ident};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Parses a unit struct with attributes. /// // Parses a unit struct with attributes.
/// // /// //
@ -103,8 +94,6 @@ ast_struct! {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub struct Attribute #manual_extra_traits { pub struct Attribute #manual_extra_traits {
pub pound_token: Token![#], pub pound_token: Token![#],
@ -146,32 +135,65 @@ impl Hash for Attribute {
impl Attribute { impl Attribute {
/// Parses the tokens after the path as a [`Meta`](enum.Meta.html) if /// Parses the tokens after the path as a [`Meta`](enum.Meta.html) if
/// possible. /// possible.
///
/// Deprecated; use `parse_meta` instead.
#[doc(hidden)]
pub fn interpret_meta(&self) -> Option<Meta> { pub fn interpret_meta(&self) -> Option<Meta> {
let name = if self.path.segments.len() == 1 { #[cfg(feature = "parsing")]
&self.path.segments.first().unwrap().value().ident {
} else { self.parse_meta().ok()
return None;
};
if self.tts.is_empty() {
return Some(Meta::Word(name.clone()));
} }
let tts = self.tts.clone().into_iter().collect::<Vec<_>>(); #[cfg(not(feature = "parsing"))]
{
let name = if self.path.segments.len() == 1 {
&self.path.segments.first().unwrap().value().ident
} else {
return None;
};
if tts.len() == 1 { if self.tts.is_empty() {
if let Some(meta) = Attribute::extract_meta_list(name.clone(), &tts[0]) { return Some(Meta::Word(name.clone()));
return Some(meta);
} }
}
if tts.len() == 2 { let tts = self.tts.clone().into_iter().collect::<Vec<_>>();
if let Some(meta) = Attribute::extract_name_value(name.clone(), &tts[0], &tts[1]) {
return Some(meta); if tts.len() == 1 {
if let Some(meta) = Attribute::extract_meta_list(name.clone(), &tts[0]) {
return Some(meta);
}
} }
if tts.len() == 2 {
if let Some(meta) = Attribute::extract_name_value(name.clone(), &tts[0], &tts[1]) {
return Some(meta);
}
}
None
}
}
/// Parses the tokens after the path as a [`Meta`](enum.Meta.html) if
/// possible.
#[cfg(feature = "parsing")]
pub fn parse_meta(&self) -> Result<Meta> {
if let Some(ref colon) = self.path.leading_colon {
return Err(Error::new(colon.spans[0], "expected meta identifier"));
} }
None let first_segment = self
.path
.segments
.first()
.expect("paths have at least one segment");
if let Some(colon) = first_segment.punct() {
return Err(Error::new(colon.spans[0], "expected meta value"));
}
let ident = first_segment.value().ident.clone();
let parser = |input: ParseStream| parsing::parse_meta_after_ident(ident, input);
parse::Parser::parse2(parser, self.tts.clone())
} }
/// Parses zero or more outer attributes from the stream. /// Parses zero or more outer attributes from the stream.
@ -200,6 +222,7 @@ impl Attribute {
Ok(attrs) Ok(attrs)
} }
#[cfg(not(feature = "parsing"))]
fn extract_meta_list(ident: Ident, tt: &TokenTree) -> Option<Meta> { fn extract_meta_list(ident: Ident, tt: &TokenTree) -> Option<Meta> {
let g = match *tt { let g = match *tt {
TokenTree::Group(ref g) => g, TokenTree::Group(ref g) => g,
@ -220,6 +243,7 @@ impl Attribute {
})) }))
} }
#[cfg(not(feature = "parsing"))]
fn extract_name_value(ident: Ident, a: &TokenTree, b: &TokenTree) -> Option<Meta> { fn extract_name_value(ident: Ident, a: &TokenTree, b: &TokenTree) -> Option<Meta> {
let a = match *a { let a = match *a {
TokenTree::Punct(ref o) => o, TokenTree::Punct(ref o) => o,
@ -256,6 +280,7 @@ impl Attribute {
} }
} }
#[cfg(not(feature = "parsing"))]
fn nested_meta_item_from_tokens(tts: &[TokenTree]) -> Option<(NestedMeta, &[TokenTree])> { fn nested_meta_item_from_tokens(tts: &[TokenTree]) -> Option<(NestedMeta, &[TokenTree])> {
assert!(!tts.is_empty()); assert!(!tts.is_empty());
@ -297,6 +322,7 @@ fn nested_meta_item_from_tokens(tts: &[TokenTree]) -> Option<(NestedMeta, &[Toke
} }
} }
#[cfg(not(feature = "parsing"))]
fn list_of_nested_meta_items_from_tokens( fn list_of_nested_meta_items_from_tokens(
mut tts: &[TokenTree], mut tts: &[TokenTree],
) -> Option<Punctuated<NestedMeta, Token![,]>> { ) -> Option<Punctuated<NestedMeta, Token![,]>> {
@ -438,6 +464,43 @@ ast_enum_of_structs! {
} }
} }
/// Conventional argument type associated with an invocation of an attribute
/// macro.
///
/// For example if we are developing an attribute macro that is intended to be
/// invoked on function items as follows:
///
/// ```edition2018
/// # const IGNORE: &str = stringify! {
/// #[my_attribute(path = "/v1/refresh")]
/// # };
/// pub fn refresh() {
/// /* ... */
/// }
/// ```
///
/// The implementation of this macro would want to parse its attribute arguments
/// as type `AttributeArgs`.
///
/// ```edition2018
/// extern crate proc_macro;
///
/// use proc_macro::TokenStream;
/// use syn::{parse_macro_input, AttributeArgs, ItemFn};
///
/// # const IGNORE: &str = stringify! {
/// #[proc_macro_attribute]
/// # };
/// pub fn my_attribute(args: TokenStream, input: TokenStream) -> TokenStream {
/// let args = parse_macro_input!(args as AttributeArgs);
/// let input = parse_macro_input!(input as ItemFn);
///
/// /* ... */
/// # "".parse().unwrap()
/// }
/// ```
pub type AttributeArgs = Vec<NestedMeta>;
pub trait FilterAttrs<'a> { pub trait FilterAttrs<'a> {
type Ret: Iterator<Item = &'a Attribute>; type Ret: Iterator<Item = &'a Attribute>;
@ -452,6 +515,7 @@ where
type Ret = iter::Filter<T::IntoIter, fn(&&Attribute) -> bool>; type Ret = iter::Filter<T::IntoIter, fn(&&Attribute) -> bool>;
fn outer(self) -> Self::Ret { fn outer(self) -> Self::Ret {
#[cfg_attr(feature = "cargo-clippy", allow(trivially_copy_pass_by_ref))]
fn is_outer(attr: &&Attribute) -> bool { fn is_outer(attr: &&Attribute) -> bool {
match attr.style { match attr.style {
AttrStyle::Outer => true, AttrStyle::Outer => true,
@ -462,6 +526,7 @@ where
} }
fn inner(self) -> Self::Ret { fn inner(self) -> Self::Ret {
#[cfg_attr(feature = "cargo-clippy", allow(trivially_copy_pass_by_ref))]
fn is_inner(attr: &&Attribute) -> bool { fn is_inner(attr: &&Attribute) -> bool {
match attr.style { match attr.style {
AttrStyle::Inner(_) => true, AttrStyle::Inner(_) => true,
@ -476,7 +541,8 @@ where
pub mod parsing { pub mod parsing {
use super::*; use super::*;
use parse::{ParseStream, Result}; use ext::IdentExt;
use parse::{Parse, ParseStream, Result};
#[cfg(feature = "full")] #[cfg(feature = "full")]
use private; use private;
@ -510,6 +576,71 @@ pub mod parsing {
attrs attrs
} }
} }
impl Parse for Meta {
fn parse(input: ParseStream) -> Result<Self> {
let ident = input.call(Ident::parse_any)?;
parse_meta_after_ident(ident, input)
}
}
impl Parse for MetaList {
fn parse(input: ParseStream) -> Result<Self> {
let ident = input.call(Ident::parse_any)?;
parse_meta_list_after_ident(ident, input)
}
}
impl Parse for MetaNameValue {
fn parse(input: ParseStream) -> Result<Self> {
let ident = input.call(Ident::parse_any)?;
parse_meta_name_value_after_ident(ident, input)
}
}
impl Parse for NestedMeta {
fn parse(input: ParseStream) -> Result<Self> {
let ahead = input.fork();
if ahead.peek(Lit) && !(ahead.peek(LitBool) && ahead.peek2(Token![=])) {
input.parse().map(NestedMeta::Literal)
} else if ahead.call(Ident::parse_any).is_ok() {
input.parse().map(NestedMeta::Meta)
} else {
Err(input.error("expected identifier or literal"))
}
}
}
pub fn parse_meta_after_ident(ident: Ident, input: ParseStream) -> Result<Meta> {
if input.peek(token::Paren) {
parse_meta_list_after_ident(ident, input).map(Meta::List)
} else if input.peek(Token![=]) {
parse_meta_name_value_after_ident(ident, input).map(Meta::NameValue)
} else {
Ok(Meta::Word(ident))
}
}
fn parse_meta_list_after_ident(ident: Ident, input: ParseStream) -> Result<MetaList> {
let content;
Ok(MetaList {
ident: ident,
paren_token: parenthesized!(content in input),
nested: content.parse_terminated(NestedMeta::parse)?,
})
}
fn parse_meta_name_value_after_ident(
ident: Ident,
input: ParseStream,
) -> Result<MetaNameValue> {
Ok(MetaNameValue {
ident: ident,
eq_token: input.parse()?,
lit: input.parse()?,
})
}
} }
#[cfg(feature = "printing")] #[cfg(feature = "printing")]

33
third_party/rust/syn/src/buffer.rs поставляемый
Просмотреть файл

@ -1,19 +1,11 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! A stably addressed token buffer supporting efficient traversal based on a //! A stably addressed token buffer supporting efficient traversal based on a
//! cheaply copyable cursor. //! cheaply copyable cursor.
//! //!
//! *This module is available if Syn is built with the `"parsing"` feature.* //! *This module is available if Syn is built with the `"parsing"` feature.*
// This module is heavily commented as it contains the only unsafe code in Syn, // This module is heavily commented as it contains most of the unsafe code in
// and caution should be used when editing it. The public-facing interface is // Syn, and caution should be used when editing it. The public-facing interface
// 100% safe but the implementation is fragile internally. // is 100% safe but the implementation is fragile internally.
#[cfg(all( #[cfg(all(
not(all(target_arch = "wasm32", target_os = "unknown")), not(all(target_arch = "wasm32", target_os = "unknown")),
@ -25,6 +17,7 @@ use proc_macro2::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenS
use std::marker::PhantomData; use std::marker::PhantomData;
use std::ptr; use std::ptr;
use private;
use Lifetime; use Lifetime;
/// Internal type which is used instead of `TokenTree` to represent a token tree /// Internal type which is used instead of `TokenTree` to represent a token tree
@ -353,3 +346,21 @@ impl<'a> Cursor<'a> {
} }
} }
} }
impl private {
#[cfg(procmacro2_semver_exempt)]
pub fn open_span_of_group(cursor: Cursor) -> Span {
match *cursor.entry() {
Entry::Group(ref group, _) => group.span_open(),
_ => cursor.span(),
}
}
#[cfg(procmacro2_semver_exempt)]
pub fn close_span_of_group(cursor: Cursor) -> Span {
match *cursor.entry() {
Entry::Group(ref group, _) => group.span_close(),
_ => cursor.span(),
}
}
}

8
third_party/rust/syn/src/data.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use punctuated::Punctuated; use punctuated::Punctuated;

8
third_party/rust/syn/src/derive.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use punctuated::Punctuated; use punctuated::Punctuated;

129
third_party/rust/syn/src/error.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std; use std;
use std::fmt::{self, Display}; use std::fmt::{self, Display};
use std::iter::FromIterator; use std::iter::FromIterator;
@ -13,8 +5,14 @@ use std::iter::FromIterator;
use proc_macro2::{ use proc_macro2::{
Delimiter, Group, Ident, LexError, Literal, Punct, Spacing, Span, TokenStream, TokenTree, Delimiter, Group, Ident, LexError, Literal, Punct, Spacing, Span, TokenStream, TokenTree,
}; };
#[cfg(feature = "printing")]
use quote::ToTokens;
#[cfg(feature = "parsing")]
use buffer::Cursor; use buffer::Cursor;
#[cfg(all(procmacro2_semver_exempt, feature = "parsing"))]
use private;
use thread::ThreadBound;
/// The result of a Syn parser. /// The result of a Syn parser.
pub type Result<T> = std::result::Result<T, Error>; pub type Result<T> = std::result::Result<T, Error>;
@ -26,12 +24,23 @@ pub type Result<T> = std::result::Result<T, Error>;
/// [module documentation]: index.html /// [module documentation]: index.html
/// ///
/// *This type is available if Syn is built with the `"parsing"` feature.* /// *This type is available if Syn is built with the `"parsing"` feature.*
#[derive(Debug, Clone)] #[derive(Debug)]
pub struct Error { pub struct Error {
span: Span, // Span is implemented as an index into a thread-local interner to keep the
// size small. It is not safe to access from a different thread. We want
// errors to be Send and Sync to play nicely with the Failure crate, so pin
// the span we're given to its original thread and assume it is
// Span::call_site if accessed from any other thread.
start_span: ThreadBound<Span>,
end_span: ThreadBound<Span>,
message: String, message: String,
} }
#[cfg(test)]
struct _Test
where
Error: Send + Sync;
impl Error { impl Error {
/// Usually the [`ParseStream::error`] method will be used instead, which /// Usually the [`ParseStream::error`] method will be used instead, which
/// automatically uses the correct span from the current position of the /// automatically uses the correct span from the current position of the
@ -44,12 +53,9 @@ impl Error {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Error, Ident, LitStr, Result, Token};
/// extern crate syn; /// use syn::parse::ParseStream;
///
/// use syn::{Ident, LitStr};
/// use syn::parse::{Error, ParseStream, Result};
/// ///
/// // Parses input that looks like `name = "string"` where the key must be /// // Parses input that looks like `name = "string"` where the key must be
/// // the identifier `name` and the value may be any string literal. /// // the identifier `name` and the value may be any string literal.
@ -65,18 +71,63 @@ impl Error {
/// let s: LitStr = input.parse()?; /// let s: LitStr = input.parse()?;
/// Ok(s) /// Ok(s)
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn new<T: Display>(span: Span, message: T) -> Self { pub fn new<T: Display>(span: Span, message: T) -> Self {
Error { Error {
span: span, start_span: ThreadBound::new(span),
end_span: ThreadBound::new(span),
message: message.to_string(), message: message.to_string(),
} }
} }
/// Creates an error with the specified message spanning the given syntax
/// tree node.
///
/// Unlike the `Error::new` constructor, this constructor takes an argument
/// `tokens` which is a syntax tree node. This allows the resulting `Error`
/// to attempt to span all tokens inside of `tokens`. While you would
/// typically be able to use the `Spanned` trait with the above `Error::new`
/// constructor, implementation limitations today mean that
/// `Error::new_spanned` may provide a higher-quality error message on
/// stable Rust.
///
/// When in doubt it's recommended to stick to `Error::new` (or
/// `ParseStream::error`)!
#[cfg(feature = "printing")]
pub fn new_spanned<T: ToTokens, U: Display>(tokens: T, message: U) -> Self {
let mut iter = tokens.into_token_stream().into_iter();
let start = iter.next().map_or_else(Span::call_site, |t| t.span());
let end = iter.last().map_or(start, |t| t.span());
Error {
start_span: ThreadBound::new(start),
end_span: ThreadBound::new(end),
message: message.to_string(),
}
}
/// The source location of the error.
///
/// Spans are not thread-safe so this function returns `Span::call_site()`
/// if called from a different thread than the one on which the `Error` was
/// originally created.
pub fn span(&self) -> Span { pub fn span(&self) -> Span {
self.span let start = match self.start_span.get() {
Some(span) => *span,
None => return Span::call_site(),
};
#[cfg(procmacro2_semver_exempt)]
{
let end = match self.end_span.get() {
Some(span) => *span,
None => return Span::call_site(),
};
start.join(end).unwrap_or(start)
}
#[cfg(not(procmacro2_semver_exempt))]
{
start
}
} }
/// Render the error as an invocation of [`compile_error!`]. /// Render the error as an invocation of [`compile_error!`].
@ -87,34 +138,46 @@ impl Error {
/// [`compile_error!`]: https://doc.rust-lang.org/std/macro.compile_error.html /// [`compile_error!`]: https://doc.rust-lang.org/std/macro.compile_error.html
/// [`parse_macro_input!`]: ../macro.parse_macro_input.html /// [`parse_macro_input!`]: ../macro.parse_macro_input.html
pub fn to_compile_error(&self) -> TokenStream { pub fn to_compile_error(&self) -> TokenStream {
let start = self
.start_span
.get()
.cloned()
.unwrap_or_else(Span::call_site);
let end = self.end_span.get().cloned().unwrap_or_else(Span::call_site);
// compile_error!($message) // compile_error!($message)
TokenStream::from_iter(vec![ TokenStream::from_iter(vec![
TokenTree::Ident(Ident::new("compile_error", self.span)), TokenTree::Ident(Ident::new("compile_error", start)),
TokenTree::Punct({ TokenTree::Punct({
let mut punct = Punct::new('!', Spacing::Alone); let mut punct = Punct::new('!', Spacing::Alone);
punct.set_span(self.span); punct.set_span(start);
punct punct
}), }),
TokenTree::Group({ TokenTree::Group({
let mut group = Group::new(Delimiter::Brace, { let mut group = Group::new(Delimiter::Brace, {
TokenStream::from_iter(vec![TokenTree::Literal({ TokenStream::from_iter(vec![TokenTree::Literal({
let mut string = Literal::string(&self.message); let mut string = Literal::string(&self.message);
string.set_span(self.span); string.set_span(end);
string string
})]) })])
}); });
group.set_span(self.span); group.set_span(end);
group group
}), }),
]) ])
} }
} }
#[cfg(feature = "parsing")]
pub fn new_at<T: Display>(scope: Span, cursor: Cursor, message: T) -> Error { pub fn new_at<T: Display>(scope: Span, cursor: Cursor, message: T) -> Error {
if cursor.eof() { if cursor.eof() {
Error::new(scope, format!("unexpected end of input, {}", message)) Error::new(scope, format!("unexpected end of input, {}", message))
} else { } else {
Error::new(cursor.span(), message) #[cfg(procmacro2_semver_exempt)]
let span = private::open_span_of_group(cursor);
#[cfg(not(procmacro2_semver_exempt))]
let span = cursor.span();
Error::new(span, message)
} }
} }
@ -124,6 +187,22 @@ impl Display for Error {
} }
} }
impl Clone for Error {
fn clone(&self) -> Self {
let start = self
.start_span
.get()
.cloned()
.unwrap_or_else(Span::call_site);
let end = self.end_span.get().cloned().unwrap_or_else(Span::call_site);
Error {
start_span: ThreadBound::new(start),
end_span: ThreadBound::new(end),
message: self.message.clone(),
}
}
}
impl std::error::Error for Error { impl std::error::Error for Error {
fn description(&self) -> &str { fn description(&self) -> &str {
"parse error" "parse error"

3
third_party/rust/syn/src/export.rs поставляемый
Просмотреть файл

@ -8,6 +8,9 @@ pub use std::marker::Copy;
pub use std::option::Option::{None, Some}; pub use std::option::Option::{None, Some};
pub use std::result::Result::{Err, Ok}; pub use std::result::Result::{Err, Ok};
#[cfg(feature = "printing")]
pub extern crate quote;
pub use proc_macro2::{Span, TokenStream as TokenStream2}; pub use proc_macro2::{Span, TokenStream as TokenStream2};
pub use span::IntoSpans; pub use span::IntoSpans;

149
third_party/rust/syn/src/expr.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use punctuated::Punctuated; use punctuated::Punctuated;
@ -27,7 +19,7 @@ ast_enum_of_structs! {
/// This type is a syntax tree enum. In Syn this and other syntax tree enums /// This type is a syntax tree enum. In Syn this and other syntax tree enums
/// are designed to be traversed using the following rebinding idiom. /// are designed to be traversed using the following rebinding idiom.
/// ///
/// ``` /// ```edition2018
/// # use syn::Expr; /// # use syn::Expr;
/// # /// #
/// # fn example(expr: Expr) { /// # fn example(expr: Expr) {
@ -60,7 +52,7 @@ ast_enum_of_structs! {
/// ///
/// The pattern is similar if the input expression is borrowed: /// The pattern is similar if the input expression is borrowed:
/// ///
/// ``` /// ```edition2018
/// # use syn::Expr; /// # use syn::Expr;
/// # /// #
/// # fn example(expr: &Expr) { /// # fn example(expr: &Expr) {
@ -74,7 +66,7 @@ ast_enum_of_structs! {
/// ///
/// This approach avoids repeating the variant names twice on every line. /// This approach avoids repeating the variant names twice on every line.
/// ///
/// ``` /// ```edition2018
/// # use syn::{Expr, ExprMethodCall}; /// # use syn::{Expr, ExprMethodCall};
/// # /// #
/// # fn example(expr: Expr) { /// # fn example(expr: Expr) {
@ -89,7 +81,7 @@ ast_enum_of_structs! {
/// In general, the name to which a syntax tree enum variant is bound should /// In general, the name to which a syntax tree enum variant is bound should
/// be a suitable name for the complete syntax tree enum type. /// be a suitable name for the complete syntax tree enum type.
/// ///
/// ``` /// ```edition2018
/// # use syn::{Expr, ExprField}; /// # use syn::{Expr, ExprField};
/// # /// #
/// # fn example(discriminant: &ExprField) { /// # fn example(discriminant: &ExprField) {
@ -768,9 +760,6 @@ ast_enum_of_structs! {
/// This type is a [syntax tree enum]. /// This type is a [syntax tree enum].
/// ///
/// [syntax tree enum]: enum.Expr.html#syntax-tree-enums /// [syntax tree enum]: enum.Expr.html#syntax-tree-enums
// Clippy false positive
// https://github.com/Manishearth/rust-clippy/issues/1241
#[cfg_attr(feature = "cargo-clippy", allow(enum_variant_names))]
pub enum Pat { pub enum Pat {
/// A pattern that matches any value: `_`. /// A pattern that matches any value: `_`.
/// ///
@ -922,7 +911,7 @@ ast_struct! {
/// ///
/// As in: /// As in:
/// ///
/// ```rust /// ```edition2018
/// # fn f() -> bool { /// # fn f() -> bool {
/// # let n = 0; /// # let n = 0;
/// match n { /// match n {
@ -1897,7 +1886,7 @@ pub mod parsing {
let mut arms = Vec::new(); let mut arms = Vec::new();
while !content.is_empty() { while !content.is_empty() {
arms.push(content.call(match_arm)?); arms.push(content.call(Arm::parse)?);
} }
Ok(ExprMatch { Ok(ExprMatch {
@ -1933,52 +1922,6 @@ pub mod parsing {
}) })
} }
#[cfg(feature = "full")]
fn match_arm(input: ParseStream) -> Result<Arm> {
let requires_comma;
Ok(Arm {
attrs: input.call(Attribute::parse_outer)?,
leading_vert: input.parse()?,
pats: {
let mut pats = Punctuated::new();
let value: Pat = input.parse()?;
pats.push_value(value);
loop {
if !input.peek(Token![|]) {
break;
}
let punct = input.parse()?;
pats.push_punct(punct);
let value: Pat = input.parse()?;
pats.push_value(value);
}
pats
},
guard: {
if input.peek(Token![if]) {
let if_token: Token![if] = input.parse()?;
let guard: Expr = input.parse()?;
Some((if_token, Box::new(guard)))
} else {
None
}
},
fat_arrow_token: input.parse()?,
body: {
let body = input.call(expr_early)?;
requires_comma = requires_terminator(&body);
Box::new(body)
},
comma: {
if requires_comma && !input.is_empty() {
Some(input.parse()?)
} else {
input.parse()?
}
},
})
}
#[cfg(feature = "full")] #[cfg(feature = "full")]
fn expr_closure(input: ParseStream, allow_struct: AllowStruct) -> Result<ExprClosure> { fn expr_closure(input: ParseStream, allow_struct: AllowStruct) -> Result<ExprClosure> {
let asyncness: Option<Token![async]> = input.parse()?; let asyncness: Option<Token![async]> = input.parse()?;
@ -2348,12 +2291,9 @@ pub mod parsing {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{braced, token, Attribute, Block, Ident, Result, Stmt, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{token, Attribute, Block, Ident, Stmt};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Parse a function with no generics or parameter list. /// // Parse a function with no generics or parameter list.
/// // /// //
@ -2394,8 +2334,6 @@ pub mod parsing {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn parse_within(input: ParseStream) -> Result<Vec<Stmt>> { pub fn parse_within(input: ParseStream) -> Result<Vec<Stmt>> {
let mut stmts = Vec::new(); let mut stmts = Vec::new();
@ -2570,23 +2508,28 @@ pub mod parsing {
|| input.peek2(Token![!]) || input.peek2(Token![!])
|| input.peek2(token::Brace) || input.peek2(token::Brace)
|| input.peek2(token::Paren) || input.peek2(token::Paren)
|| input.peek2(Token![..]) && !{ || input.peek2(Token![..])
let ahead = input.fork(); && !{
ahead.parse::<Ident>()?; let ahead = input.fork();
ahead.parse::<RangeLimits>()?; ahead.parse::<Ident>()?;
ahead.is_empty() || ahead.peek(Token![,]) ahead.parse::<RangeLimits>()?;
} ahead.is_empty() || ahead.peek(Token![,])
}
}) })
|| input.peek(Token![self]) && input.peek2(Token![::])
|| input.peek(Token![::]) || input.peek(Token![::])
|| input.peek(Token![<]) || input.peek(Token![<])
|| input.peek(Token![self])
|| input.peek(Token![Self]) || input.peek(Token![Self])
|| input.peek(Token![super]) || input.peek(Token![super])
|| input.peek(Token![extern]) || input.peek(Token![extern])
|| input.peek(Token![crate]) || input.peek(Token![crate])
{ {
pat_path_or_macro_or_struct_or_range(input) pat_path_or_macro_or_struct_or_range(input)
} else if input.peek(Token![ref]) || input.peek(Token![mut]) || input.peek(Ident) { } else if input.peek(Token![ref])
|| input.peek(Token![mut])
|| input.peek(Token![self])
|| input.peek(Ident)
{
input.call(pat_ident).map(Pat::Ident) input.call(pat_ident).map(Pat::Ident)
} else if lookahead.peek(token::Paren) { } else if lookahead.peek(token::Paren) {
input.call(pat_tuple).map(Pat::Tuple) input.call(pat_tuple).map(Pat::Tuple)
@ -2782,6 +2725,54 @@ pub mod parsing {
} }
} }
#[cfg(feature = "full")]
impl Parse for Arm {
fn parse(input: ParseStream) -> Result<Arm> {
let requires_comma;
Ok(Arm {
attrs: input.call(Attribute::parse_outer)?,
leading_vert: input.parse()?,
pats: {
let mut pats = Punctuated::new();
let value: Pat = input.parse()?;
pats.push_value(value);
loop {
if !input.peek(Token![|]) {
break;
}
let punct = input.parse()?;
pats.push_punct(punct);
let value: Pat = input.parse()?;
pats.push_value(value);
}
pats
},
guard: {
if input.peek(Token![if]) {
let if_token: Token![if] = input.parse()?;
let guard: Expr = input.parse()?;
Some((if_token, Box::new(guard)))
} else {
None
}
},
fat_arrow_token: input.parse()?,
body: {
let body = input.call(expr_early)?;
requires_comma = requires_terminator(&body);
Box::new(body)
},
comma: {
if requires_comma && !input.is_empty() {
Some(input.parse()?)
} else {
input.parse()?
}
},
})
}
}
impl Parse for Index { impl Parse for Index {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let lit: LitInt = input.parse()?; let lit: LitInt = input.parse()?;

11
third_party/rust/syn/src/ext.rs поставляемый
Просмотреть файл

@ -17,13 +17,10 @@ pub trait IdentExt: Sized + private::Sealed {
/// This is useful when parsing a DSL which allows Rust keywords as /// This is useful when parsing a DSL which allows Rust keywords as
/// identifiers. /// identifiers.
/// ///
/// ```rust /// ```edition2018
/// #[macro_use] /// use syn::{Error, Ident, Result, Token};
/// extern crate syn;
///
/// use syn::Ident;
/// use syn::ext::IdentExt; /// use syn::ext::IdentExt;
/// use syn::parse::{Error, ParseStream, Result}; /// use syn::parse::ParseStream;
/// ///
/// // Parses input that looks like `name = NAME` where `NAME` can be /// // Parses input that looks like `name = NAME` where `NAME` can be
/// // any identifier. /// // any identifier.
@ -41,8 +38,6 @@ pub trait IdentExt: Sized + private::Sealed {
/// let name = input.call(Ident::parse_any)?; /// let name = input.call(Ident::parse_any)?;
/// Ok(name) /// Ok(name)
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
fn parse_any(input: ParseStream) -> Result<Self>; fn parse_any(input: ParseStream) -> Result<Self>;
} }

12
third_party/rust/syn/src/file.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
ast_struct! { ast_struct! {
@ -18,9 +10,7 @@ ast_struct! {
/// Parse a Rust source file into a `syn::File` and print out a debug /// Parse a Rust source file into a `syn::File` and print out a debug
/// representation of the syntax tree. /// representation of the syntax tree.
/// ///
/// ``` /// ```edition2018
/// # extern crate syn;
/// #
/// use std::env; /// use std::env;
/// use std::fs::File; /// use std::fs::File;
/// use std::io::Read; /// use std::io::Read;

1
third_party/rust/syn/src/gen/fold.rs поставляемый
Просмотреть файл

@ -1,7 +1,6 @@
// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT // THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
#![allow(unreachable_code)] #![allow(unreachable_code)]
#![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
use gen::helper::fold::*; use gen::helper::fold::*;
use proc_macro2::Span; use proc_macro2::Span;

2
third_party/rust/syn/src/gen/visit.rs поставляемый
Просмотреть файл

@ -1,6 +1,6 @@
// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT // THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #![cfg_attr(feature = "cargo-clippy", allow(trivially_copy_pass_by_ref))]
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
use gen::helper::visit::*; use gen::helper::visit::*;
use proc_macro2::Span; use proc_macro2::Span;

1
third_party/rust/syn/src/gen/visit_mut.rs поставляемый
Просмотреть файл

@ -1,6 +1,5 @@
// THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT // THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT
#![cfg_attr(feature = "cargo-clippy", allow(match_same_arms))]
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
use gen::helper::visit_mut::*; use gen::helper::visit_mut::*;
use proc_macro2::Span; use proc_macro2::Span;

8
third_party/rust/syn/src/gen_helper.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[cfg(feature = "fold")] #[cfg(feature = "fold")]
pub mod fold { pub mod fold {
use fold::Fold; use fold::Fold;

32
third_party/rust/syn/src/generics.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use punctuated::{Iter, IterMut, Punctuated}; use punctuated::{Iter, IterMut, Punctuated};
@ -300,14 +292,9 @@ impl Generics {
/// Split a type's generics into the pieces required for impl'ing a trait /// Split a type's generics into the pieces required for impl'ing a trait
/// for that type. /// for that type.
/// ///
/// ``` /// ```edition2018
/// # #[macro_use]
/// # extern crate quote;
/// #
/// # extern crate proc_macro2;
/// # extern crate syn;
/// #
/// # use proc_macro2::{Span, Ident}; /// # use proc_macro2::{Span, Ident};
/// # use quote::quote;
/// # /// #
/// # fn main() { /// # fn main() {
/// # let generics: syn::Generics = Default::default(); /// # let generics: syn::Generics = Default::default();
@ -490,19 +477,13 @@ pub mod parsing {
impl Parse for Generics { impl Parse for Generics {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let mut params = Punctuated::new();
if !input.peek(Token![<]) { if !input.peek(Token![<]) {
return Ok(Generics { return Ok(Generics::default());
lt_token: None,
params: params,
gt_token: None,
where_clause: None,
});
} }
let lt_token: Token![<] = input.parse()?; let lt_token: Token![<] = input.parse()?;
let mut params = Punctuated::new();
let mut has_type_param = false; let mut has_type_param = false;
loop { loop {
if input.peek(Token![>]) { if input.peek(Token![>]) {
@ -658,7 +639,10 @@ pub mod parsing {
let mut bounds = Punctuated::new(); let mut bounds = Punctuated::new();
if has_colon { if has_colon {
loop { loop {
if input.peek(Token![,]) || input.peek(Token![>]) { if input.peek(Token![,])
|| input.peek(Token![>])
|| input.peek(Token![=])
{
break; break;
} }
let value = input.parse()?; let value = input.parse()?;

45
third_party/rust/syn/src/group.rs поставляемый
Просмотреть файл

@ -74,9 +74,13 @@ impl private {
fn parse_delimited(input: ParseStream, delimiter: Delimiter) -> Result<(Span, ParseBuffer)> { fn parse_delimited(input: ParseStream, delimiter: Delimiter) -> Result<(Span, ParseBuffer)> {
input.step(|cursor| { input.step(|cursor| {
if let Some((content, span, rest)) = cursor.group(delimiter) { if let Some((content, span, rest)) = cursor.group(delimiter) {
let unexpected = private::get_unexpected(input); #[cfg(procmacro2_semver_exempt)]
let scope = private::close_span_of_group(*cursor);
#[cfg(not(procmacro2_semver_exempt))]
let scope = span;
let nested = private::advance_step_cursor(cursor, content); let nested = private::advance_step_cursor(cursor, content);
let content = private::new_parse_buffer(span, nested, unexpected); let unexpected = private::get_unexpected(input);
let content = private::new_parse_buffer(scope, nested, unexpected);
Ok(((span, content), rest)) Ok(((span, content), rest))
} else { } else {
let message = match delimiter { let message = match delimiter {
@ -94,15 +98,11 @@ fn parse_delimited(input: ParseStream, delimiter: Delimiter) -> Result<(Span, Pa
/// ///
/// # Example /// # Example
/// ///
/// ```rust /// ```edition2018
/// # #[macro_use] /// # use quote::quote;
/// # extern crate quote;
/// # /// #
/// #[macro_use] /// use syn::{parenthesized, token, Ident, Result, Token, Type};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{token, Ident, Type};
/// use syn::parse::{Parse, ParseStream, Result};
/// use syn::punctuated::Punctuated; /// use syn::punctuated::Punctuated;
/// ///
/// // Parse a simplified tuple struct syntax like: /// // Parse a simplified tuple struct syntax like:
@ -155,14 +155,11 @@ macro_rules! parenthesized {
/// ///
/// # Example /// # Example
/// ///
/// ```rust /// ```edition2018
/// # #[macro_use] /// # use quote::quote;
/// # extern crate quote;
/// # /// #
/// #[macro_use] /// use syn::{braced, token, Ident, Result, Token, Type};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
/// use syn::{token, Ident, Type};
/// use syn::parse::{Parse, ParseStream, Result};
/// use syn::punctuated::Punctuated; /// use syn::punctuated::Punctuated;
/// ///
/// // Parse a simplified struct syntax like: /// // Parse a simplified struct syntax like:
@ -236,18 +233,12 @@ macro_rules! braced {
/// ///
/// # Example /// # Example
/// ///
/// ```rust /// ```edition2018
/// # #[macro_use] /// # use quote::quote;
/// # extern crate quote;
/// # /// #
/// #[macro_use]
/// extern crate syn;
///
/// extern crate proc_macro2;
///
/// use proc_macro2::TokenStream; /// use proc_macro2::TokenStream;
/// use syn::token; /// use syn::{bracketed, token, Result, Token};
/// use syn::parse::{Parse, ParseStream, Result}; /// use syn::parse::{Parse, ParseStream};
/// ///
/// // Parse an outer attribute like: /// // Parse an outer attribute like:
/// // /// //

318
third_party/rust/syn/src/item.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use derive::{Data, DeriveInput}; use derive::{Data, DeriveInput};
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
@ -770,6 +762,8 @@ pub mod parsing {
use ext::IdentExt; use ext::IdentExt;
use parse::{Parse, ParseStream, Result}; use parse::{Parse, ParseStream, Result};
use proc_macro2::{Punct, Spacing, TokenTree};
use std::iter::FromIterator;
impl Parse for Item { impl Parse for Item {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
@ -807,7 +801,7 @@ pub mod parsing {
} else if lookahead.peek(Token![const]) { } else if lookahead.peek(Token![const]) {
ahead.parse::<Token![const]>()?; ahead.parse::<Token![const]>()?;
let lookahead = ahead.lookahead1(); let lookahead = ahead.lookahead1();
if lookahead.peek(Ident) { if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
input.parse().map(Item::Const) input.parse().map(Item::Const)
} else if lookahead.peek(Token![unsafe]) } else if lookahead.peek(Token![unsafe])
|| lookahead.peek(Token![async]) || lookahead.peek(Token![async])
@ -849,9 +843,9 @@ pub mod parsing {
input.parse().map(Item::Enum) input.parse().map(Item::Enum)
} else if lookahead.peek(Token![union]) && ahead.peek2(Ident) { } else if lookahead.peek(Token![union]) && ahead.peek2(Ident) {
input.parse().map(Item::Union) input.parse().map(Item::Union)
} else if lookahead.peek(Token![trait]) } else if lookahead.peek(Token![trait]) {
|| lookahead.peek(Token![auto]) && ahead.peek2(Token![trait]) input.call(parse_trait_or_trait_alias)
{ } else if lookahead.peek(Token![auto]) && ahead.peek2(Token![trait]) {
input.parse().map(Item::Trait) input.parse().map(Item::Trait)
} else if lookahead.peek(Token![impl ]) } else if lookahead.peek(Token![impl ])
|| lookahead.peek(Token![default]) && !ahead.peek2(Token![!]) || lookahead.peek(Token![default]) && !ahead.peek2(Token![!])
@ -903,17 +897,54 @@ pub mod parsing {
// TODO: figure out the actual grammar; is body required to be braced? // TODO: figure out the actual grammar; is body required to be braced?
impl Parse for ItemMacro2 { impl Parse for ItemMacro2 {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let attrs = input.call(Attribute::parse_outer)?;
let vis: Visibility = input.parse()?;
let macro_token: Token![macro] = input.parse()?;
let ident: Ident = input.parse()?;
let paren_token;
let args; let args;
let brace_token;
let body; let body;
let lookahead = input.lookahead1();
if lookahead.peek(token::Paren) {
let paren_content;
paren_token = parenthesized!(paren_content in input);
args = paren_content.parse()?;
let brace_content;
brace_token = braced!(brace_content in input);
body = brace_content.parse()?;
} else if lookahead.peek(token::Brace) {
// Hack: the ItemMacro2 syntax tree will need to change so that
// we can store None for the args.
//
// https://github.com/dtolnay/syn/issues/548
//
// For now, store some sentinel tokens that are otherwise
// illegal.
paren_token = token::Paren::default();
args = TokenStream::from_iter(vec![
TokenTree::Punct(Punct::new('$', Spacing::Alone)),
TokenTree::Punct(Punct::new('$', Spacing::Alone)),
]);
let brace_content;
brace_token = braced!(brace_content in input);
body = brace_content.parse()?;
} else {
return Err(lookahead.error());
}
Ok(ItemMacro2 { Ok(ItemMacro2 {
attrs: input.call(Attribute::parse_outer)?, attrs: attrs,
vis: input.parse()?, vis: vis,
macro_token: input.parse()?, macro_token: macro_token,
ident: input.parse()?, ident: ident,
paren_token: parenthesized!(args in input), paren_token: paren_token,
args: args.parse()?, args: args,
brace_token: braced!(body in input), brace_token: brace_token,
body: body.parse()?, body: body,
}) })
} }
} }
@ -925,7 +956,13 @@ pub mod parsing {
vis: input.parse()?, vis: input.parse()?,
extern_token: input.parse()?, extern_token: input.parse()?,
crate_token: input.parse()?, crate_token: input.parse()?,
ident: input.parse()?, ident: {
if input.peek(Token![self]) {
input.call(Ident::parse_any)?
} else {
input.parse()?
}
},
rename: { rename: {
if input.peek(Token![as]) { if input.peek(Token![as]) {
let as_token: Token![as] = input.parse()?; let as_token: Token![as] = input.parse()?;
@ -1023,7 +1060,14 @@ pub mod parsing {
attrs: input.call(Attribute::parse_outer)?, attrs: input.call(Attribute::parse_outer)?,
vis: input.parse()?, vis: input.parse()?,
const_token: input.parse()?, const_token: input.parse()?,
ident: input.parse()?, ident: {
let lookahead = input.lookahead1();
if lookahead.peek(Ident) || lookahead.peek(Token![_]) {
input.call(Ident::parse_any)?
} else {
return Err(lookahead.error());
}
},
colon_token: input.parse()?, colon_token: input.parse()?,
ty: input.parse()?, ty: input.parse()?,
eq_token: input.parse()?, eq_token: input.parse()?,
@ -1438,6 +1482,34 @@ pub mod parsing {
} }
} }
fn parse_trait_or_trait_alias(input: ParseStream) -> Result<Item> {
let (attrs, vis, trait_token, ident, generics) = parse_start_of_trait_alias(input)?;
let lookahead = input.lookahead1();
if lookahead.peek(token::Brace)
|| lookahead.peek(Token![:])
|| lookahead.peek(Token![where])
{
let unsafety = None;
let auto_token = None;
parse_rest_of_trait(
input,
attrs,
vis,
unsafety,
auto_token,
trait_token,
ident,
generics,
)
.map(Item::Trait)
} else if lookahead.peek(Token![=]) {
parse_rest_of_trait_alias(input, attrs, vis, trait_token, ident, generics)
.map(Item::TraitAlias)
} else {
Err(lookahead.error())
}
}
impl Parse for ItemTrait { impl Parse for ItemTrait {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let attrs = input.call(Attribute::parse_outer)?; let attrs = input.call(Attribute::parse_outer)?;
@ -1446,85 +1518,125 @@ pub mod parsing {
let auto_token: Option<Token![auto]> = input.parse()?; let auto_token: Option<Token![auto]> = input.parse()?;
let trait_token: Token![trait] = input.parse()?; let trait_token: Token![trait] = input.parse()?;
let ident: Ident = input.parse()?; let ident: Ident = input.parse()?;
let mut generics: Generics = input.parse()?; let generics: Generics = input.parse()?;
let colon_token: Option<Token![:]> = input.parse()?; parse_rest_of_trait(
input,
attrs,
vis,
unsafety,
auto_token,
trait_token,
ident,
generics,
)
}
}
let mut supertraits = Punctuated::new(); fn parse_rest_of_trait(
if colon_token.is_some() { input: ParseStream,
loop { attrs: Vec<Attribute>,
supertraits.push_value(input.parse()?); vis: Visibility,
if input.peek(Token![where]) || input.peek(token::Brace) { unsafety: Option<Token![unsafe]>,
break; auto_token: Option<Token![auto]>,
} trait_token: Token![trait],
supertraits.push_punct(input.parse()?); ident: Ident,
if input.peek(Token![where]) || input.peek(token::Brace) { mut generics: Generics,
break; ) -> Result<ItemTrait> {
} let colon_token: Option<Token![:]> = input.parse()?;
let mut supertraits = Punctuated::new();
if colon_token.is_some() {
loop {
supertraits.push_value(input.parse()?);
if input.peek(Token![where]) || input.peek(token::Brace) {
break;
}
supertraits.push_punct(input.parse()?);
if input.peek(Token![where]) || input.peek(token::Brace) {
break;
} }
} }
generics.where_clause = input.parse()?;
let content;
let brace_token = braced!(content in input);
let mut items = Vec::new();
while !content.is_empty() {
items.push(content.parse()?);
}
Ok(ItemTrait {
attrs: attrs,
vis: vis,
unsafety: unsafety,
auto_token: auto_token,
trait_token: trait_token,
ident: ident,
generics: generics,
colon_token: colon_token,
supertraits: supertraits,
brace_token: brace_token,
items: items,
})
} }
generics.where_clause = input.parse()?;
let content;
let brace_token = braced!(content in input);
let mut items = Vec::new();
while !content.is_empty() {
items.push(content.parse()?);
}
Ok(ItemTrait {
attrs: attrs,
vis: vis,
unsafety: unsafety,
auto_token: auto_token,
trait_token: trait_token,
ident: ident,
generics: generics,
colon_token: colon_token,
supertraits: supertraits,
brace_token: brace_token,
items: items,
})
} }
impl Parse for ItemTraitAlias { impl Parse for ItemTraitAlias {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let attrs = input.call(Attribute::parse_outer)?; let (attrs, vis, trait_token, ident, generics) = parse_start_of_trait_alias(input)?;
let vis: Visibility = input.parse()?; parse_rest_of_trait_alias(input, attrs, vis, trait_token, ident, generics)
let trait_token: Token![trait] = input.parse()?;
let ident: Ident = input.parse()?;
let mut generics: Generics = input.parse()?;
let eq_token: Token![=] = input.parse()?;
let mut bounds = Punctuated::new();
loop {
if input.peek(Token![where]) || input.peek(Token![;]) {
break;
}
bounds.push_value(input.parse()?);
if input.peek(Token![where]) || input.peek(Token![;]) {
break;
}
bounds.push_punct(input.parse()?);
}
generics.where_clause = input.parse()?;
let semi_token: Token![;] = input.parse()?;
Ok(ItemTraitAlias {
attrs: attrs,
vis: vis,
trait_token: trait_token,
ident: ident,
generics: generics,
eq_token: eq_token,
bounds: bounds,
semi_token: semi_token,
})
} }
} }
fn parse_start_of_trait_alias(
input: ParseStream,
) -> Result<(Vec<Attribute>, Visibility, Token![trait], Ident, Generics)> {
let attrs = input.call(Attribute::parse_outer)?;
let vis: Visibility = input.parse()?;
let trait_token: Token![trait] = input.parse()?;
let ident: Ident = input.parse()?;
let generics: Generics = input.parse()?;
Ok((attrs, vis, trait_token, ident, generics))
}
fn parse_rest_of_trait_alias(
input: ParseStream,
attrs: Vec<Attribute>,
vis: Visibility,
trait_token: Token![trait],
ident: Ident,
mut generics: Generics,
) -> Result<ItemTraitAlias> {
let eq_token: Token![=] = input.parse()?;
let mut bounds = Punctuated::new();
loop {
if input.peek(Token![where]) || input.peek(Token![;]) {
break;
}
bounds.push_value(input.parse()?);
if input.peek(Token![where]) || input.peek(Token![;]) {
break;
}
bounds.push_punct(input.parse()?);
}
generics.where_clause = input.parse()?;
let semi_token: Token![;] = input.parse()?;
Ok(ItemTraitAlias {
attrs: attrs,
vis: vis,
trait_token: trait_token,
ident: ident,
generics: generics,
eq_token: eq_token,
bounds: bounds,
semi_token: semi_token,
})
}
impl Parse for TraitItem { impl Parse for TraitItem {
fn parse(input: ParseStream) -> Result<Self> { fn parse(input: ParseStream) -> Result<Self> {
let ahead = input.fork(); let ahead = input.fork();
@ -1712,7 +1824,20 @@ pub mod parsing {
let defaultness: Option<Token![default]> = input.parse()?; let defaultness: Option<Token![default]> = input.parse()?;
let unsafety: Option<Token![unsafe]> = input.parse()?; let unsafety: Option<Token![unsafe]> = input.parse()?;
let impl_token: Token![impl ] = input.parse()?; let impl_token: Token![impl ] = input.parse()?;
let generics: Generics = input.parse()?;
let has_generics = input.peek(Token![<])
&& (input.peek2(Token![>])
|| input.peek2(Token![#])
|| (input.peek2(Ident) || input.peek2(Lifetime))
&& (input.peek3(Token![:])
|| input.peek3(Token![,])
|| input.peek3(Token![>])));
let generics: Generics = if has_generics {
input.parse()?
} else {
Generics::default()
};
let trait_ = { let trait_ = {
let ahead = input.fork(); let ahead = input.fork();
if ahead.parse::<Option<Token![!]>>().is_ok() if ahead.parse::<Option<Token![!]>>().is_ok()
@ -2231,9 +2356,14 @@ mod printing {
self.vis.to_tokens(tokens); self.vis.to_tokens(tokens);
self.macro_token.to_tokens(tokens); self.macro_token.to_tokens(tokens);
self.ident.to_tokens(tokens); self.ident.to_tokens(tokens);
self.paren_token.surround(tokens, |tokens| {
self.args.to_tokens(tokens); // Hack: see comment in impl Parse for ItemMacro2.
}); if self.args.to_string() != "$ $" {
self.paren_token.surround(tokens, |tokens| {
self.args.to_tokens(tokens);
});
}
self.brace_token.surround(tokens, |tokens| { self.brace_token.surround(tokens, |tokens| {
self.body.to_tokens(tokens); self.body.to_tokens(tokens);
}); });

24
third_party/rust/syn/src/keyword.rs поставляемый
Просмотреть файл

@ -7,15 +7,10 @@
/// module called `kw` or `keyword` and that the resulting parser be invoked /// module called `kw` or `keyword` and that the resulting parser be invoked
/// with a `kw::` or `keyword::` prefix. /// with a `kw::` or `keyword::` prefix.
/// ///
/// ``` /// ```edition2018
/// # #[macro_use]
/// # extern crate syn;
/// #
/// mod kw { /// mod kw {
/// custom_keyword!(whatever); /// syn::custom_keyword!(whatever);
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
/// ///
/// The generated syntax tree node supports the following operations just like /// The generated syntax tree node supports the following operations just like
@ -48,16 +43,13 @@
/// identifier that is not a keyword, these can be declared as custom keywords /// identifier that is not a keyword, these can be declared as custom keywords
/// by crates that need to use them as such. /// by crates that need to use them as such.
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{LitBool, LitStr, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{LitBool, LitStr};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// mod kw { /// mod kw {
/// custom_keyword!(bool); /// syn::custom_keyword!(bool);
/// custom_keyword!(str); /// syn::custom_keyword!(str);
/// } /// }
/// ///
/// enum Argument { /// enum Argument {
@ -93,8 +85,6 @@
/// } /// }
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
#[macro_export(local_inner_macros)] #[macro_export(local_inner_macros)]
macro_rules! custom_keyword { macro_rules! custom_keyword {

194
third_party/rust/syn/src/lib.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! Syn is a parsing library for parsing a stream of Rust tokens into a syntax //! Syn is a parsing library for parsing a stream of Rust tokens into a syntax
//! tree of Rust source code. //! tree of Rust source code.
//! //!
@ -72,16 +64,12 @@
//! proc-macro = true //! proc-macro = true
//! ``` //! ```
//! //!
//! ```rust //! ```edition2018
//! #[macro_use]
//! extern crate quote;
//! #[macro_use]
//! extern crate syn;
//!
//! extern crate proc_macro; //! extern crate proc_macro;
//! //!
//! use proc_macro::TokenStream; //! use proc_macro::TokenStream;
//! use syn::DeriveInput; //! use quote::quote;
//! use syn::{parse_macro_input, DeriveInput};
//! //!
//! # const IGNORE_TOKENS: &str = stringify! { //! # const IGNORE_TOKENS: &str = stringify! {
//! #[proc_macro_derive(MyMacro)] //! #[proc_macro_derive(MyMacro)]
@ -98,18 +86,16 @@
//! // Hand the output tokens back to the compiler //! // Hand the output tokens back to the compiler
//! TokenStream::from(expanded) //! TokenStream::from(expanded)
//! } //! }
//! #
//! # fn main() {}
//! ``` //! ```
//! //!
//! The [`heapsize`] example directory shows a complete working Macros 1.1 //! The [`heapsize`] example directory shows a complete working Macros 1.1
//! implementation of a custom derive. It works on any Rust compiler \>=1.15.0. //! implementation of a custom derive. It works on any Rust compiler 1.15+.
//! The example derives a `HeapSize` trait which computes an estimate of the //! The example derives a `HeapSize` trait which computes an estimate of the
//! amount of heap memory owned by a value. //! amount of heap memory owned by a value.
//! //!
//! [`heapsize`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize //! [`heapsize`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize
//! //!
//! ```rust //! ```edition2018
//! pub trait HeapSize { //! pub trait HeapSize {
//! /// Total number of bytes of heap memory owned by `self`. //! /// Total number of bytes of heap memory owned by `self`.
//! fn heap_size_of_children(&self) -> usize; //! fn heap_size_of_children(&self) -> usize;
@ -119,7 +105,7 @@
//! The custom derive allows users to write `#[derive(HeapSize)]` on data //! The custom derive allows users to write `#[derive(HeapSize)]` on data
//! structures in their program. //! structures in their program.
//! //!
//! ```rust //! ```edition2018
//! # const IGNORE_TOKENS: &str = stringify! { //! # const IGNORE_TOKENS: &str = stringify! {
//! #[derive(HeapSize)] //! #[derive(HeapSize)]
//! # }; //! # };
@ -133,18 +119,11 @@
//! //!
//! ## Spans and error reporting //! ## Spans and error reporting
//! //!
//! The [`heapsize2`] example directory is an extension of the `heapsize`
//! example that demonstrates some of the hygiene and error reporting properties
//! of Macros 2.0. This example currently requires a nightly Rust compiler
//! \>=1.24.0-nightly but we are working to stabilize all of the APIs involved.
//!
//! [`heapsize2`]: https://github.com/dtolnay/syn/tree/master/examples/heapsize2
//!
//! The token-based procedural macro API provides great control over where the //! The token-based procedural macro API provides great control over where the
//! compiler's error messages are displayed in user code. Consider the error the //! compiler's error messages are displayed in user code. Consider the error the
//! user sees if one of their field types does not implement `HeapSize`. //! user sees if one of their field types does not implement `HeapSize`.
//! //!
//! ```rust //! ```edition2018
//! # const IGNORE_TOKENS: &str = stringify! { //! # const IGNORE_TOKENS: &str = stringify! {
//! #[derive(HeapSize)] //! #[derive(HeapSize)]
//! # }; //! # };
@ -154,20 +133,8 @@
//! } //! }
//! ``` //! ```
//! //!
//! In the Macros 1.1 string-based procedural macro world, the resulting error
//! would point unhelpfully to the invocation of the derive macro and not to the
//! actual problematic field.
//!
//! ```text
//! error[E0599]: no method named `heap_size_of_children` found for type `std::thread::Thread` in the current scope
//! --> src/main.rs:4:10
//! |
//! 4 | #[derive(HeapSize)]
//! | ^^^^^^^^
//! ```
//!
//! By tracking span information all the way through the expansion of a //! By tracking span information all the way through the expansion of a
//! procedural macro as shown in the `heapsize2` example, token-based macros in //! procedural macro as shown in the `heapsize` example, token-based macros in
//! Syn are able to trigger errors that directly pinpoint the source of the //! Syn are able to trigger errors that directly pinpoint the source of the
//! problem. //! problem.
//! //!
@ -190,7 +157,7 @@
//! The example reimplements the popular `lazy_static` crate from crates.io as a //! The example reimplements the popular `lazy_static` crate from crates.io as a
//! procedural macro. //! procedural macro.
//! //!
//! ``` //! ```edition2018
//! # macro_rules! lazy_static { //! # macro_rules! lazy_static {
//! # ($($tt:tt)*) => {} //! # ($($tt:tt)*) => {}
//! # } //! # }
@ -255,7 +222,7 @@
//! dynamic library libproc_macro from rustc toolchain. //! dynamic library libproc_macro from rustc toolchain.
// Syn types in rustdoc of other crates get linked to here. // Syn types in rustdoc of other crates get linked to here.
#![doc(html_root_url = "https://docs.rs/syn/0.15.7")] #![doc(html_root_url = "https://docs.rs/syn/0.15.24")]
#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))] #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
// Ignored clippy lints. // Ignored clippy lints.
@ -265,15 +232,14 @@
block_in_if_condition_stmt, block_in_if_condition_stmt,
const_static_lifetime, const_static_lifetime,
cyclomatic_complexity, cyclomatic_complexity,
deprecated_cfg_attr,
doc_markdown, doc_markdown,
eval_order_dependence, eval_order_dependence,
large_enum_variant, large_enum_variant,
match_bool,
never_loop,
redundant_closure,
needless_pass_by_value, needless_pass_by_value,
never_loop,
redundant_field_names, redundant_field_names,
trivially_copy_pass_by_ref too_many_arguments,
) )
)] )]
// Ignored clippy_pedantic lints. // Ignored clippy_pedantic lints.
@ -284,15 +250,14 @@
cast_possible_wrap, cast_possible_wrap,
empty_enum, empty_enum,
if_not_else, if_not_else,
indexing_slicing,
items_after_statements, items_after_statements,
module_name_repetitions,
shadow_unrelated, shadow_unrelated,
similar_names, similar_names,
single_match_else, single_match_else,
stutter,
unseparated_literal_suffix, unseparated_literal_suffix,
use_self, use_self,
used_underscore_binding used_underscore_binding,
) )
)] )]
@ -325,7 +290,7 @@ pub use ident::Ident;
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
mod attr; mod attr;
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
pub use attr::{AttrStyle, Attribute, Meta, MetaList, MetaNameValue, NestedMeta}; pub use attr::{AttrStyle, Attribute, AttributeArgs, Meta, MetaList, MetaNameValue, NestedMeta};
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
mod data; mod data;
@ -362,10 +327,7 @@ pub use generics::{
PredicateLifetime, PredicateType, TraitBound, TraitBoundModifier, TypeParam, TypeParamBound, PredicateLifetime, PredicateType, TraitBound, TraitBoundModifier, TypeParam, TypeParamBound,
WhereClause, WherePredicate, WhereClause, WherePredicate,
}; };
#[cfg(all( #[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
any(feature = "full", feature = "derive"),
feature = "printing"
))]
pub use generics::{ImplGenerics, Turbofish, TypeGenerics}; pub use generics::{ImplGenerics, Turbofish, TypeGenerics};
#[cfg(feature = "full")] #[cfg(feature = "full")]
@ -435,10 +397,7 @@ pub mod buffer;
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
pub mod ext; pub mod ext;
pub mod punctuated; pub mod punctuated;
#[cfg(all( #[cfg(all(any(feature = "full", feature = "derive"), feature = "extra-traits"))]
any(feature = "full", feature = "derive"),
feature = "extra-traits"
))]
mod tt; mod tt;
// Not public API except the `parse_quote!` macro. // Not public API except the `parse_quote!` macro.
@ -446,6 +405,15 @@ mod tt;
#[doc(hidden)] #[doc(hidden)]
pub mod parse_quote; pub mod parse_quote;
// Not public API except the `parse_macro_input!` macro.
#[cfg(all(
not(all(target_arch = "wasm32", target_os = "unknown")),
feature = "parsing",
feature = "proc-macro"
))]
#[doc(hidden)]
pub mod parse_macro_input;
#[cfg(all(feature = "parsing", feature = "printing"))] #[cfg(all(feature = "parsing", feature = "printing"))]
pub mod spanned; pub mod spanned;
@ -459,7 +427,7 @@ mod gen {
/// ///
/// [`Visit`]: trait.Visit.html /// [`Visit`]: trait.Visit.html
/// ///
/// ```rust /// ```edition2018
/// # use syn::{Attribute, BinOp, Expr, ExprBinary}; /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
/// # /// #
/// pub trait Visit<'ast> { /// pub trait Visit<'ast> {
@ -495,7 +463,7 @@ mod gen {
/// ///
/// [`VisitMut`]: trait.VisitMut.html /// [`VisitMut`]: trait.VisitMut.html
/// ///
/// ```rust /// ```edition2018
/// # use syn::{Attribute, BinOp, Expr, ExprBinary}; /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
/// # /// #
/// pub trait VisitMut { /// pub trait VisitMut {
@ -531,7 +499,7 @@ mod gen {
/// ///
/// [`Fold`]: trait.Fold.html /// [`Fold`]: trait.Fold.html
/// ///
/// ```rust /// ```edition2018
/// # use syn::{Attribute, BinOp, Expr, ExprBinary}; /// # use syn::{Attribute, BinOp, Expr, ExprBinary};
/// # /// #
/// pub trait Fold { /// pub trait Fold {
@ -580,12 +548,11 @@ pub mod parse;
mod span; mod span;
#[cfg(all( #[cfg(all(any(feature = "full", feature = "derive"), feature = "printing"))]
any(feature = "full", feature = "derive"),
feature = "printing"
))]
mod print; mod print;
mod thread;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#[cfg(any(feature = "parsing", feature = "full", feature = "derive"))] #[cfg(any(feature = "parsing", feature = "full", feature = "derive"))]
@ -594,10 +561,8 @@ struct private;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#[cfg(feature = "parsing")]
mod error; mod error;
#[cfg(feature = "parsing")] pub use error::{Error, Result};
use error::Error;
/// Parse tokens of source code into the chosen syntax tree node. /// Parse tokens of source code into the chosen syntax tree node.
/// ///
@ -617,14 +582,11 @@ use error::Error;
/// ///
/// # Examples /// # Examples
/// ///
/// ```rust /// ```edition2018
/// #[macro_use]
/// extern crate quote;
///
/// extern crate proc_macro; /// extern crate proc_macro;
/// extern crate syn;
/// ///
/// use proc_macro::TokenStream; /// use proc_macro::TokenStream;
/// use quote::quote;
/// use syn::DeriveInput; /// use syn::DeriveInput;
/// ///
/// # const IGNORE_TOKENS: &str = stringify! { /// # const IGNORE_TOKENS: &str = stringify! {
@ -642,15 +604,13 @@ use error::Error;
/// // Convert into a token stream and return it /// // Convert into a token stream and return it
/// expanded.into() /// expanded.into()
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
#[cfg(all( #[cfg(all(
not(all(target_arch = "wasm32", target_os = "unknown")), not(all(target_arch = "wasm32", target_os = "unknown")),
feature = "parsing", feature = "parsing",
feature = "proc-macro" feature = "proc-macro"
))] ))]
pub fn parse<T: parse::Parse>(tokens: proc_macro::TokenStream) -> Result<T, Error> { pub fn parse<T: parse::Parse>(tokens: proc_macro::TokenStream) -> Result<T> {
parse::Parser::parse(T::parse, tokens) parse::Parser::parse(T::parse, tokens)
} }
@ -667,7 +627,7 @@ pub fn parse<T: parse::Parse>(tokens: proc_macro::TokenStream) -> Result<T, Erro
/// ///
/// *This function is available if Syn is built with the `"parsing"` feature.* /// *This function is available if Syn is built with the `"parsing"` feature.*
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T, Error> { pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T> {
parse::Parser::parse2(T::parse, tokens) parse::Parser::parse2(T::parse, tokens)
} }
@ -682,11 +642,8 @@ pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T, Er
/// ///
/// # Examples /// # Examples
/// ///
/// ```rust /// ```edition2018
/// # extern crate syn; /// use syn::{Expr, Result};
/// #
/// use syn::Expr;
/// use syn::parse::Result;
/// ///
/// fn run() -> Result<()> { /// fn run() -> Result<()> {
/// let code = "assert_eq!(u8::max_value(), 255)"; /// let code = "assert_eq!(u8::max_value(), 255)";
@ -695,10 +652,12 @@ pub fn parse2<T: parse::Parse>(tokens: proc_macro2::TokenStream) -> Result<T, Er
/// Ok(()) /// Ok(())
/// } /// }
/// # /// #
/// # fn main() { run().unwrap() } /// # fn main() {
/// # run().unwrap();
/// # }
/// ``` /// ```
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T, Error> { pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T> {
parse::Parser::parse_str(T::parse, s) parse::Parser::parse_str(T::parse, s)
} }
@ -717,9 +676,7 @@ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T, Error> {
/// ///
/// # Examples /// # Examples
/// ///
/// ```rust,no_run /// ```edition2018,no_run
/// # extern crate syn;
/// #
/// use std::error::Error; /// use std::error::Error;
/// use std::fs::File; /// use std::fs::File;
/// use std::io::Read; /// use std::io::Read;
@ -738,10 +695,12 @@ pub fn parse_str<T: parse::Parse>(s: &str) -> Result<T, Error> {
/// Ok(()) /// Ok(())
/// } /// }
/// # /// #
/// # fn main() { run().unwrap() } /// # fn main() {
/// # run().unwrap();
/// # }
/// ``` /// ```
#[cfg(all(feature = "parsing", feature = "full"))] #[cfg(all(feature = "parsing", feature = "full"))]
pub fn parse_file(mut content: &str) -> Result<File, Error> { pub fn parse_file(mut content: &str) -> Result<File> {
// Strip the BOM if it is present // Strip the BOM if it is present
const BOM: &'static str = "\u{feff}"; const BOM: &'static str = "\u{feff}";
if content.starts_with(BOM) { if content.starts_with(BOM) {
@ -763,58 +722,3 @@ pub fn parse_file(mut content: &str) -> Result<File, Error> {
file.shebang = shebang; file.shebang = shebang;
Ok(file) Ok(file)
} }
/// Parse the input TokenStream of a macro, triggering a compile error if the
/// tokens fail to parse.
///
/// Refer to the [`parse` module] documentation for more details about parsing
/// in Syn.
///
/// [`parse` module]: parse/index.html
///
/// # Intended usage
///
/// ```rust
/// #[macro_use]
/// extern crate syn;
///
/// extern crate proc_macro;
///
/// use proc_macro::TokenStream;
/// use syn::parse::{Parse, ParseStream, Result};
///
/// struct MyMacroInput {
/// /* ... */
/// }
///
/// impl Parse for MyMacroInput {
/// fn parse(input: ParseStream) -> Result<Self> {
/// /* ... */
/// # Ok(MyMacroInput {})
/// }
/// }
///
/// # const IGNORE: &str = stringify! {
/// #[proc_macro]
/// # };
/// pub fn my_macro(tokens: TokenStream) -> TokenStream {
/// let input = parse_macro_input!(tokens as MyMacroInput);
///
/// /* ... */
/// # "".parse().unwrap()
/// }
/// #
/// # fn main() {}
/// ```
#[cfg(feature = "proc-macro")]
#[macro_export]
macro_rules! parse_macro_input {
($tokenstream:ident as $ty:ty) => {
match $crate::parse::<$ty>($tokenstream) {
$crate::export::Ok(data) => data,
$crate::export::Err(err) => {
return $crate::export::TokenStream::from(err.to_compile_error());
}
};
};
}

13
third_party/rust/syn/src/lifetime.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::cmp::Ordering; use std::cmp::Ordering;
use std::fmt::{self, Display}; use std::fmt::{self, Display};
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
@ -43,10 +35,7 @@ impl Lifetime {
/// ///
/// # Invocation /// # Invocation
/// ///
/// ``` /// ```edition2018
/// # extern crate proc_macro2;
/// # extern crate syn;
/// #
/// # use proc_macro2::Span; /// # use proc_macro2::Span;
/// # use syn::Lifetime; /// # use syn::Lifetime;
/// # /// #

81
third_party/rust/syn/src/lit.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use proc_macro2::{Literal, Span}; use proc_macro2::{Literal, Span};
use std::str; use std::str;
@ -129,35 +121,23 @@ impl LitStr {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// # extern crate proc_macro2;
/// # extern crate syn;
/// #
/// use proc_macro2::Span; /// use proc_macro2::Span;
/// use syn::{Attribute, Ident, Lit, Meta, MetaNameValue, Path}; /// use syn::{Attribute, Error, Ident, Lit, Meta, MetaNameValue, Path, Result};
/// use syn::parse::{Error, Result};
/// ///
/// // Parses the path from an attribute that looks like: /// // Parses the path from an attribute that looks like:
/// // /// //
/// // #[path = "a::b::c"] /// // #[path = "a::b::c"]
/// // /// //
/// // or returns the path `Self` as a default if the attribute is not of /// // or returns `None` if the input is some other attribute.
/// // that form. /// fn get_path(attr: &Attribute) -> Result<Option<Path>> {
/// fn get_path(attr: &Attribute) -> Result<Path> { /// if !attr.path.is_ident("path") {
/// let default = || Path::from(Ident::new("Self", Span::call_site())); /// return Ok(None);
///
/// let meta = match attr.interpret_meta() {
/// Some(meta) => meta,
/// None => return Ok(default()),
/// };
///
/// if meta.name() != "path" {
/// return Ok(default());
/// } /// }
/// ///
/// match meta { /// match attr.parse_meta()? {
/// Meta::NameValue(MetaNameValue { lit: Lit::Str(lit_str), .. }) => { /// Meta::NameValue(MetaNameValue { lit: Lit::Str(lit_str), .. }) => {
/// lit_str.parse() /// lit_str.parse().map(Some)
/// } /// }
/// _ => { /// _ => {
/// let error_span = attr.bracket_token.span; /// let error_span = attr.bracket_token.span;
@ -656,20 +636,24 @@ mod value {
_ => {} _ => {}
}, },
b'\'' => return Lit::Char(LitChar { token: token }), b'\'' => return Lit::Char(LitChar { token: token }),
b'0'...b'9' => if number_is_int(&value) { b'0'...b'9' => {
return Lit::Int(LitInt { token: token }); if number_is_int(&value) {
} else if number_is_float(&value) { return Lit::Int(LitInt { token: token });
return Lit::Float(LitFloat { token: token }); } else if number_is_float(&value) {
} else { return Lit::Float(LitFloat { token: token });
// number overflow } else {
return Lit::Verbatim(LitVerbatim { token: token }); // number overflow
}, return Lit::Verbatim(LitVerbatim { token: token });
_ => if value == "true" || value == "false" { }
return Lit::Bool(LitBool { }
value: value == "true", _ => {
span: token.span(), if value == "true" || value == "false" {
}); return Lit::Bool(LitBool {
}, value: value == "true",
span: token.span(),
});
}
}
} }
panic!("Unrecognized literal: {}", value); panic!("Unrecognized literal: {}", value);
@ -954,12 +938,13 @@ mod value {
let mut ch = 0; let mut ch = 0;
let b0 = byte(s, 0); let b0 = byte(s, 0);
let b1 = byte(s, 1); let b1 = byte(s, 1);
ch += 0x10 * match b0 { ch += 0x10
b'0'...b'9' => b0 - b'0', * match b0 {
b'a'...b'f' => 10 + (b0 - b'a'), b'0'...b'9' => b0 - b'0',
b'A'...b'F' => 10 + (b0 - b'A'), b'a'...b'f' => 10 + (b0 - b'a'),
_ => panic!("unexpected non-hex character after \\x"), b'A'...b'F' => 10 + (b0 - b'A'),
}; _ => panic!("unexpected non-hex character after \\x"),
};
ch += match b1 { ch += match b1 {
b'0'...b'9' => b1 - b'0', b'0'...b'9' => b1 - b'0',
b'a'...b'f' => 10 + (b1 - b'a'), b'a'...b'f' => 10 + (b1 - b'a'),

23
third_party/rust/syn/src/lookahead.rs поставляемый
Просмотреть файл

@ -21,12 +21,9 @@ use token::Token;
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, Token, TypeParam};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, TypeParam};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // A generic parameter, a single one of the comma-separated elements inside /// // A generic parameter, a single one of the comma-separated elements inside
/// // angle brackets in: /// // angle brackets in:
@ -59,8 +56,6 @@ use token::Token;
/// } /// }
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub struct Lookahead1<'a> { pub struct Lookahead1<'a> {
scope: Span, scope: Span,
@ -114,11 +109,13 @@ impl<'a> Lookahead1<'a> {
pub fn error(self) -> Error { pub fn error(self) -> Error {
let comparisons = self.comparisons.borrow(); let comparisons = self.comparisons.borrow();
match comparisons.len() { match comparisons.len() {
0 => if self.cursor.eof() { 0 => {
Error::new(self.scope, "unexpected end of input") if self.cursor.eof() {
} else { Error::new(self.scope, "unexpected end of input")
Error::new(self.cursor.span(), "unexpected token") } else {
}, Error::new(self.cursor.span(), "unexpected token")
}
}
1 => { 1 => {
let message = format!("expected {}", comparisons[0]); let message = format!("expected {}", comparisons[0]);
error::new_at(self.scope, self.cursor, message) error::new_at(self.scope, self.cursor, message)

8
third_party/rust/syn/src/mac.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]

19
third_party/rust/syn/src/macros.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[cfg(any(feature = "full", feature = "derive"))] #[cfg(any(feature = "full", feature = "derive"))]
macro_rules! ast_struct { macro_rules! ast_struct {
( (
@ -113,10 +105,7 @@ macro_rules! ast_enum_of_structs {
) )
} }
#[cfg(all( #[cfg(all(feature = "printing", any(feature = "full", feature = "derive")))]
feature = "printing",
any(feature = "full", feature = "derive")
))]
macro_rules! generate_to_tokens { macro_rules! generate_to_tokens {
(do_not_generate_to_tokens $($foo:tt)*) => (); (do_not_generate_to_tokens $($foo:tt)*) => ();
@ -152,11 +141,7 @@ macro_rules! to_tokens_call {
}; };
} }
#[cfg(all( #[cfg(all(feature = "printing", feature = "derive", not(feature = "full")))]
feature = "printing",
feature = "derive",
not(feature = "full")
))]
macro_rules! to_tokens_call { macro_rules! to_tokens_call {
// If the variant is marked as #full, don't auto-generate to-tokens for it. // If the variant is marked as #full, don't auto-generate to-tokens for it.
($e:ident, $tokens:ident, #full $($rest:tt)*) => { ($e:ident, $tokens:ident, #full $($rest:tt)*) => {

8
third_party/rust/syn/src/op.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
ast_enum! { ast_enum! {
/// A binary operator: `+`, `+=`, `&`. /// A binary operator: `+`, `+=`, `&`.
/// ///

269
third_party/rust/syn/src/parse.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! Parsing interface for parsing a token stream into a syntax tree node. //! Parsing interface for parsing a token stream into a syntax tree node.
//! //!
//! Parsing in Syn is built on parser functions that take in a [`ParseStream`] //! Parsing in Syn is built on parser functions that take in a [`ParseStream`]
@ -33,15 +25,12 @@
//! //!
//! [`parse_macro_input!`]: ../macro.parse_macro_input.html //! [`parse_macro_input!`]: ../macro.parse_macro_input.html
//! //!
//! ``` //! ```edition2018
//! #[macro_use]
//! extern crate syn;
//!
//! extern crate proc_macro; //! extern crate proc_macro;
//! //!
//! use proc_macro::TokenStream; //! use proc_macro::TokenStream;
//! use syn::{token, Field, Ident}; //! use syn::{braced, parse_macro_input, token, Field, Ident, Result, Token};
//! use syn::parse::{Parse, ParseStream, Result}; //! use syn::parse::{Parse, ParseStream};
//! use syn::punctuated::Punctuated; //! use syn::punctuated::Punctuated;
//! //!
//! enum Item { //! enum Item {
@ -98,8 +87,6 @@
//! /* ... */ //! /* ... */
//! # "".parse().unwrap() //! # "".parse().unwrap()
//! } //! }
//! #
//! # fn main() {}
//! ``` //! ```
//! //!
//! # The `syn::parse*` functions //! # The `syn::parse*` functions
@ -114,10 +101,10 @@
//! [`syn::parse_str`]: ../fn.parse_str.html //! [`syn::parse_str`]: ../fn.parse_str.html
//! [`Parse`]: trait.Parse.html //! [`Parse`]: trait.Parse.html
//! //!
//! ``` //! ```edition2018
//! use syn::Type; //! use syn::Type;
//! //!
//! # fn run_parser() -> Result<(), syn::parse::Error> { //! # fn run_parser() -> syn::Result<()> {
//! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?; //! let t: Type = syn::parse_str("std::collections::HashMap<String, Value>")?;
//! # Ok(()) //! # Ok(())
//! # } //! # }
@ -145,10 +132,20 @@
//! The `Parse` trait is not implemented in these cases because there is no good //! The `Parse` trait is not implemented in these cases because there is no good
//! behavior to consider the default. //! behavior to consider the default.
//! //!
//! ```ignore //! ```edition2018,compile_fail
//! # extern crate proc_macro;
//! #
//! # use syn::punctuated::Punctuated;
//! # use syn::{PathSegment, Result, Token};
//! #
//! # fn f(tokens: proc_macro::TokenStream) -> Result<()> {
//! #
//! // Can't parse `Punctuated` without knowing whether trailing punctuation //! // Can't parse `Punctuated` without knowing whether trailing punctuation
//! // should be allowed in this context. //! // should be allowed in this context.
//! let path: Punctuated<PathSegment, Token![::]> = syn::parse(tokens)?; //! let path: Punctuated<PathSegment, Token![::]> = syn::parse(tokens)?;
//! #
//! # Ok(())
//! # }
//! ``` //! ```
//! //!
//! In these cases the types provide a choice of parser functions rather than a //! In these cases the types provide a choice of parser functions rather than a
@ -157,39 +154,34 @@
//! //!
//! [`Parser`]: trait.Parser.html //! [`Parser`]: trait.Parser.html
//! //!
//! ``` //! ```edition2018
//! #[macro_use] //! extern crate proc_macro;
//! extern crate syn;
//! //!
//! extern crate proc_macro2; //! use proc_macro::TokenStream;
//!
//! use proc_macro2::TokenStream;
//! use syn::parse::Parser; //! use syn::parse::Parser;
//! use syn::punctuated::Punctuated; //! use syn::punctuated::Punctuated;
//! use syn::{Attribute, Expr, PathSegment}; //! use syn::{Attribute, Expr, PathSegment, Result, Token};
//! //!
//! # fn run_parsers() -> Result<(), syn::parse::Error> { //! fn call_some_parser_methods(input: TokenStream) -> Result<()> {
//! # let tokens = TokenStream::new().into(); //! // Parse a nonempty sequence of path segments separated by `::` punctuation
//! // Parse a nonempty sequence of path segments separated by `::` punctuation //! // with no trailing punctuation.
//! // with no trailing punctuation. //! let tokens = input.clone();
//! let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty; //! let parser = Punctuated::<PathSegment, Token![::]>::parse_separated_nonempty;
//! let path = parser.parse(tokens)?; //! let _path = parser.parse(tokens)?;
//! //!
//! # let tokens = TokenStream::new().into(); //! // Parse a possibly empty sequence of expressions terminated by commas with
//! // Parse a possibly empty sequence of expressions terminated by commas with //! // an optional trailing punctuation.
//! // an optional trailing punctuation. //! let tokens = input.clone();
//! let parser = Punctuated::<Expr, Token![,]>::parse_terminated; //! let parser = Punctuated::<Expr, Token![,]>::parse_terminated;
//! let args = parser.parse(tokens)?; //! let _args = parser.parse(tokens)?;
//! //!
//! # let tokens = TokenStream::new().into(); //! // Parse zero or more outer attributes but not inner attributes.
//! // Parse zero or more outer attributes but not inner attributes. //! let tokens = input.clone();
//! let parser = Attribute::parse_outer; //! let parser = Attribute::parse_outer;
//! let attrs = parser.parse(tokens)?; //! let _attrs = parser.parse(tokens)?;
//! # //!
//! # Ok(()) //! Ok(())
//! # } //! }
//! #
//! # fn main() {}
//! ``` //! ```
//! //!
//! --- //! ---
@ -197,7 +189,7 @@
//! *This module is available if Syn is built with the `"parsing"` feature.* //! *This module is available if Syn is built with the `"parsing"` feature.*
use std::cell::Cell; use std::cell::Cell;
use std::fmt::Display; use std::fmt::{self, Debug, Display};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::mem; use std::mem;
use std::ops::Deref; use std::ops::Deref;
@ -242,6 +234,19 @@ pub type ParseStream<'a> = &'a ParseBuffer<'a>;
/// ///
/// `ParseStream` is the input type for all parser functions in Syn. They have /// `ParseStream` is the input type for all parser functions in Syn. They have
/// the signature `fn(ParseStream) -> Result<T>`. /// the signature `fn(ParseStream) -> Result<T>`.
///
/// ## Calling a parser function
///
/// There is no public way to construct a `ParseBuffer`. Instead, if you are
/// looking to invoke a parser function that requires `ParseStream` as input,
/// you will need to go through one of the public parsing entry points.
///
/// - The [`parse_macro_input!`] macro if parsing input of a procedural macro;
/// - One of [the `syn::parse*` functions][syn-parse]; or
/// - A method of the [`Parser`] trait.
///
/// [`parse_macro_input!`]: ../macro.parse_macro_input.html
/// [syn-parse]: index.html#the-synparse-functions
pub struct ParseBuffer<'a> { pub struct ParseBuffer<'a> {
scope: Span, scope: Span,
// Instead of Cell<Cursor<'a>> so that ParseBuffer<'a> is covariant in 'a. // Instead of Cell<Cursor<'a>> so that ParseBuffer<'a> is covariant in 'a.
@ -268,6 +273,18 @@ impl<'a> Drop for ParseBuffer<'a> {
} }
} }
impl<'a> Display for ParseBuffer<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Display::fmt(&self.cursor().token_stream(), f)
}
}
impl<'a> Debug for ParseBuffer<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
Debug::fmt(&self.cursor().token_stream(), f)
}
}
/// Cursor state associated with speculative parsing. /// Cursor state associated with speculative parsing.
/// ///
/// This type is the input of the closure provided to [`ParseStream::step`]. /// This type is the input of the closure provided to [`ParseStream::step`].
@ -276,12 +293,10 @@ impl<'a> Drop for ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// # extern crate proc_macro2;
/// # extern crate syn;
/// #
/// use proc_macro2::TokenTree; /// use proc_macro2::TokenTree;
/// use syn::parse::{ParseStream, Result}; /// use syn::Result;
/// use syn::parse::ParseStream;
/// ///
/// // This function advances the stream past the next occurrence of `@`. If /// // This function advances the stream past the next occurrence of `@`. If
/// // no `@` is present in the stream, the stream position is unchanged and /// // no `@` is present in the stream, the stream position is unchanged and
@ -301,7 +316,20 @@ impl<'a> Drop for ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// # /// #
/// # fn main() {} /// # fn remainder_after_skipping_past_next_at(
/// # input: ParseStream,
/// # ) -> Result<proc_macro2::TokenStream> {
/// # skip_past_next_at(input)?;
/// # input.parse()
/// # }
/// #
/// # fn main() {
/// # use syn::parse::Parser;
/// # let remainder = remainder_after_skipping_past_next_at
/// # .parse_str("a @ b c")
/// # .unwrap();
/// # assert_eq!(remainder.to_string(), "b c");
/// # }
/// ``` /// ```
#[derive(Copy, Clone)] #[derive(Copy, Clone)]
pub struct StepCursor<'c, 'a> { pub struct StepCursor<'c, 'a> {
@ -358,7 +386,8 @@ fn skip(input: ParseStream) -> bool {
} else { } else {
Ok((false, *cursor)) Ok((false, *cursor))
} }
}).unwrap() })
.unwrap()
} }
impl private { impl private {
@ -398,12 +427,9 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// [`Attribute::parse_outer`]: ../struct.Attribute.html#method.parse_outer /// [`Attribute::parse_outer`]: ../struct.Attribute.html#method.parse_outer
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Attribute, Ident, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{Attribute, Ident};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Parses a unit struct with attributes. /// // Parses a unit struct with attributes.
/// // /// //
@ -426,8 +452,6 @@ impl<'a> ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn call<T>(&self, function: fn(ParseStream) -> Result<T>) -> Result<T> { pub fn call<T>(&self, function: fn(ParseStream) -> Result<T>) -> Result<T> {
function(self) function(self)
@ -454,12 +478,9 @@ impl<'a> ParseBuffer<'a> {
/// In this example we finish parsing the list of supertraits when the next /// In this example we finish parsing the list of supertraits when the next
/// token in the input is either `where` or an opening curly brace. /// token in the input is either `where` or an opening curly brace.
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{braced, token, Generics, Ident, Result, Token, TypeParamBound};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{token, Generics, Ident, TypeParamBound};
/// use syn::parse::{Parse, ParseStream, Result};
/// use syn::punctuated::Punctuated; /// use syn::punctuated::Punctuated;
/// ///
/// // Parses a trait definition containing no associated items. /// // Parses a trait definition containing no associated items.
@ -506,8 +527,6 @@ impl<'a> ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn peek<T: Peek>(&self, token: T) -> bool { pub fn peek<T: Peek>(&self, token: T) -> bool {
let _ = token; let _ = token;
@ -526,12 +545,9 @@ impl<'a> ParseBuffer<'a> {
/// union` and a macro invocation that looks like `union::some_macro! { ... /// union` and a macro invocation that looks like `union::some_macro! { ...
/// }`. In other words `union` is a contextual keyword. /// }`. In other words `union` is a contextual keyword.
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Ident, ItemUnion, Macro, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{Ident, ItemUnion, Macro};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Parses either a union or a macro invocation. /// // Parses either a union or a macro invocation.
/// enum UnionOrMacro { /// enum UnionOrMacro {
@ -550,8 +566,6 @@ impl<'a> ParseBuffer<'a> {
/// } /// }
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn peek2<T: Peek>(&self, token: T) -> bool { pub fn peek2<T: Peek>(&self, token: T) -> bool {
let ahead = self.fork(); let ahead = self.fork();
@ -572,15 +586,11 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ```rust /// ```edition2018
/// # #[macro_use] /// # use quote::quote;
/// # extern crate quote;
/// # /// #
/// #[macro_use] /// use syn::{parenthesized, token, Ident, Result, Token, Type};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{token, Ident, Type};
/// use syn::parse::{Parse, ParseStream, Result};
/// use syn::punctuated::Punctuated; /// use syn::punctuated::Punctuated;
/// ///
/// // Parse a simplified tuple struct syntax like: /// // Parse a simplified tuple struct syntax like:
@ -628,12 +638,9 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ```rust /// ```edition2018
/// #[macro_use] /// use syn::{braced, token, Ident, Item, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{token, Ident, Item};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Parses a Rust `mod m { ... }` containing zero or more items. /// // Parses a Rust `mod m { ... }` containing zero or more items.
/// struct Mod { /// struct Mod {
@ -660,8 +667,7 @@ impl<'a> ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// } /// }
/// # /// ```
/// # fn main() {}
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.cursor().eof() self.cursor().eof()
} }
@ -671,12 +677,9 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, Result, Token, TypeParam};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::{ConstParam, Ident, Lifetime, LifetimeDef, TypeParam};
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // A generic parameter, a single one of the comma-separated elements inside /// // A generic parameter, a single one of the comma-separated elements inside
/// // angle brackets in: /// // angle brackets in:
@ -709,8 +712,6 @@ impl<'a> ParseBuffer<'a> {
/// } /// }
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn lookahead1(&self) -> Lookahead1<'a> { pub fn lookahead1(&self) -> Lookahead1<'a> {
lookahead::new(self.scope, self.cursor()) lookahead::new(self.scope, self.cursor())
@ -726,9 +727,9 @@ impl<'a> ParseBuffer<'a> {
/// is if your macro ends up parsing a large amount of content more than /// is if your macro ends up parsing a large amount of content more than
/// once. /// once.
/// ///
/// ``` /// ```edition2018
/// # use syn::Expr; /// # use syn::{Expr, Result};
/// # use syn::parse::{ParseStream, Result}; /// # use syn::parse::ParseStream;
/// # /// #
/// # fn bad(input: ParseStream) -> Result<Expr> { /// # fn bad(input: ParseStream) -> Result<Expr> {
/// // Do not do this. /// // Do not do this.
@ -763,7 +764,7 @@ impl<'a> ParseBuffer<'a> {
/// needs to distinguish parentheses that specify visibility restrictions /// needs to distinguish parentheses that specify visibility restrictions
/// from parentheses that form part of a tuple type. /// from parentheses that form part of a tuple type.
/// ///
/// ``` /// ```edition2018
/// # struct A; /// # struct A;
/// # struct B; /// # struct B;
/// # struct C; /// # struct C;
@ -780,13 +781,10 @@ impl<'a> ParseBuffer<'a> {
/// parentheses after the `pub` keyword. This is a small bounded amount of /// parentheses after the `pub` keyword. This is a small bounded amount of
/// work performed against the forked parse stream. /// work performed against the forked parse stream.
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{parenthesized, token, Ident, Path, Result, Token};
/// extern crate syn;
///
/// use syn::{token, Ident, Path};
/// use syn::ext::IdentExt; /// use syn::ext::IdentExt;
/// use syn::parse::{Parse, ParseStream, Result}; /// use syn::parse::{Parse, ParseStream};
/// ///
/// struct PubVisibility { /// struct PubVisibility {
/// pub_token: Token![pub], /// pub_token: Token![pub],
@ -838,8 +836,6 @@ impl<'a> ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn fork(&self) -> Self { pub fn fork(&self) -> Self {
ParseBuffer { ParseBuffer {
@ -856,12 +852,9 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Expr, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::Expr;
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // Some kind of loop: `while` or `for` or `loop`. /// // Some kind of loop: `while` or `for` or `loop`.
/// struct Loop { /// struct Loop {
@ -882,8 +875,6 @@ impl<'a> ParseBuffer<'a> {
/// } /// }
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn error<T: Display>(&self, message: T) -> Error { pub fn error<T: Display>(&self, message: T) -> Error {
error::new_at(self.scope, self.cursor(), message) error::new_at(self.scope, self.cursor(), message)
@ -898,12 +889,10 @@ impl<'a> ParseBuffer<'a> {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// # extern crate proc_macro2;
/// # extern crate syn;
/// #
/// use proc_macro2::TokenTree; /// use proc_macro2::TokenTree;
/// use syn::parse::{ParseStream, Result}; /// use syn::Result;
/// use syn::parse::ParseStream;
/// ///
/// // This function advances the stream past the next occurrence of `@`. If /// // This function advances the stream past the next occurrence of `@`. If
/// // no `@` is present in the stream, the stream position is unchanged and /// // no `@` is present in the stream, the stream position is unchanged and
@ -911,7 +900,7 @@ impl<'a> ParseBuffer<'a> {
/// fn skip_past_next_at(input: ParseStream) -> Result<()> { /// fn skip_past_next_at(input: ParseStream) -> Result<()> {
/// input.step(|cursor| { /// input.step(|cursor| {
/// let mut rest = *cursor; /// let mut rest = *cursor;
/// while let Some((tt, next)) = cursor.token_tree() { /// while let Some((tt, next)) = rest.token_tree() {
/// match tt { /// match tt {
/// TokenTree::Punct(ref punct) if punct.as_char() == '@' => { /// TokenTree::Punct(ref punct) if punct.as_char() == '@' => {
/// return Ok(((), next)); /// return Ok(((), next));
@ -923,7 +912,20 @@ impl<'a> ParseBuffer<'a> {
/// }) /// })
/// } /// }
/// # /// #
/// # fn main() {} /// # fn remainder_after_skipping_past_next_at(
/// # input: ParseStream,
/// # ) -> Result<proc_macro2::TokenStream> {
/// # skip_past_next_at(input)?;
/// # input.parse()
/// # }
/// #
/// # fn main() {
/// # use syn::parse::Parser;
/// # let remainder = remainder_after_skipping_past_next_at
/// # .parse_str("a @ b c")
/// # .unwrap();
/// # assert_eq!(remainder.to_string(), "b c");
/// # }
/// ``` /// ```
pub fn step<F, R>(&self, function: F) -> Result<R> pub fn step<F, R>(&self, function: F) -> Result<R>
where where
@ -1047,10 +1049,16 @@ pub trait Parser: Sized {
type Output; type Output;
/// Parse a proc-macro2 token stream into the chosen syntax tree node. /// Parse a proc-macro2 token stream into the chosen syntax tree node.
///
/// This function will check that the input is fully parsed. If there are
/// any unparsed tokens at the end of the stream, an error is returned.
fn parse2(self, tokens: TokenStream) -> Result<Self::Output>; fn parse2(self, tokens: TokenStream) -> Result<Self::Output>;
/// Parse tokens of source code into the chosen syntax tree node. /// Parse tokens of source code into the chosen syntax tree node.
/// ///
/// This function will check that the input is fully parsed. If there are
/// any unparsed tokens at the end of the stream, an error is returned.
///
/// *This method is available if Syn is built with both the `"parsing"` and /// *This method is available if Syn is built with both the `"parsing"` and
/// `"proc-macro"` features.* /// `"proc-macro"` features.*
#[cfg(all( #[cfg(all(
@ -1063,6 +1071,9 @@ pub trait Parser: Sized {
/// Parse a string of Rust code into the chosen syntax tree node. /// Parse a string of Rust code into the chosen syntax tree node.
/// ///
/// This function will check that the input is fully parsed. If there are
/// any unparsed tokens at the end of the string, an error is returned.
///
/// # Hygiene /// # Hygiene
/// ///
/// Every span in the resulting syntax tree will be set to resolve at the /// Every span in the resulting syntax tree will be set to resolve at the

103
third_party/rust/syn/src/parse_macro_input.rs поставляемый Normal file
Просмотреть файл

@ -0,0 +1,103 @@
/// Parse the input TokenStream of a macro, triggering a compile error if the
/// tokens fail to parse.
///
/// Refer to the [`parse` module] documentation for more details about parsing
/// in Syn.
///
/// [`parse` module]: parse/index.html
///
/// # Intended usage
///
/// ```edition2018
/// extern crate proc_macro;
///
/// use proc_macro::TokenStream;
/// use syn::{parse_macro_input, Result};
/// use syn::parse::{Parse, ParseStream};
///
/// struct MyMacroInput {
/// /* ... */
/// }
///
/// impl Parse for MyMacroInput {
/// fn parse(input: ParseStream) -> Result<Self> {
/// /* ... */
/// # Ok(MyMacroInput {})
/// }
/// }
///
/// # const IGNORE: &str = stringify! {
/// #[proc_macro]
/// # };
/// pub fn my_macro(tokens: TokenStream) -> TokenStream {
/// let input = parse_macro_input!(tokens as MyMacroInput);
///
/// /* ... */
/// # "".parse().unwrap()
/// }
/// ```
#[macro_export(local_inner_macros)]
macro_rules! parse_macro_input {
($tokenstream:ident as $ty:ty) => {
match $crate::parse_macro_input::parse::<$ty>($tokenstream) {
$crate::export::Ok(data) => data,
$crate::export::Err(err) => {
return $crate::export::TokenStream::from(err.to_compile_error());
}
}
};
($tokenstream:ident) => {
parse_macro_input!($tokenstream as _)
};
}
////////////////////////////////////////////////////////////////////////////////
// Can parse any type that implements Parse.
use parse::{Parse, ParseStream, Parser, Result};
use proc_macro::TokenStream;
// Not public API.
#[doc(hidden)]
pub fn parse<T: ParseMacroInput>(token_stream: TokenStream) -> Result<T> {
T::parse.parse(token_stream)
}
// Not public API.
#[doc(hidden)]
pub trait ParseMacroInput: Sized {
fn parse(input: ParseStream) -> Result<Self>;
}
impl<T: Parse> ParseMacroInput for T {
fn parse(input: ParseStream) -> Result<Self> {
<T as Parse>::parse(input)
}
}
////////////////////////////////////////////////////////////////////////////////
// Any other types that we want `parse_macro_input!` to be able to parse.
#[cfg(any(feature = "full", feature = "derive"))]
use AttributeArgs;
#[cfg(any(feature = "full", feature = "derive"))]
impl ParseMacroInput for AttributeArgs {
fn parse(input: ParseStream) -> Result<Self> {
let mut metas = Vec::new();
loop {
if input.is_empty() {
break;
}
let value = input.parse()?;
metas.push(value);
if input.is_empty() {
break;
}
input.parse::<Token![,]>()?;
}
Ok(metas)
}
}

44
third_party/rust/syn/src/parse_quote.rs поставляемый
Просмотреть файл

@ -8,13 +8,9 @@
/// ///
/// [`Parse`]: parse/trait.Parse.html /// [`Parse`]: parse/trait.Parse.html
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use quote::quote;
/// extern crate quote; /// use syn::{parse_quote, Stmt};
/// #[macro_use]
/// extern crate syn;
///
/// use syn::Stmt;
/// ///
/// fn main() { /// fn main() {
/// let name = quote!(v); /// let name = quote!(v);
@ -37,13 +33,8 @@
/// The following helper function adds a bound `T: HeapSize` to every type /// The following helper function adds a bound `T: HeapSize` to every type
/// parameter `T` in the input generics. /// parameter `T` in the input generics.
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{parse_quote, Generics, GenericParam};
/// extern crate quote;
/// #[macro_use]
/// extern crate syn;
///
/// use syn::{Generics, GenericParam};
/// ///
/// // Add a bound `T: HeapSize` to every type parameter T. /// // Add a bound `T: HeapSize` to every type parameter T.
/// fn add_trait_bounds(mut generics: Generics) -> Generics { /// fn add_trait_bounds(mut generics: Generics) -> Generics {
@ -54,8 +45,6 @@
/// } /// }
/// generics /// generics
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
/// ///
/// # Special cases /// # Special cases
@ -76,10 +65,29 @@
/// Panics if the tokens fail to parse as the expected syntax tree type. The /// Panics if the tokens fail to parse as the expected syntax tree type. The
/// caller is responsible for ensuring that the input tokens are syntactically /// caller is responsible for ensuring that the input tokens are syntactically
/// valid. /// valid.
#[macro_export] #[macro_export(local_inner_macros)]
macro_rules! parse_quote { macro_rules! parse_quote {
($($tt:tt)*) => { ($($tt:tt)*) => {
$crate::parse_quote::parse($crate::export::From::from(quote!($($tt)*))) $crate::parse_quote::parse($crate::export::From::from(quote_impl!($($tt)*)))
};
}
#[cfg(not(syn_can_call_macro_by_path))]
#[doc(hidden)]
#[macro_export]
macro_rules! quote_impl {
($($tt:tt)*) => {
// Require caller to have their own `#[macro_use] extern crate quote`.
quote!($($tt)*)
};
}
#[cfg(syn_can_call_macro_by_path)]
#[doc(hidden)]
#[macro_export]
macro_rules! quote_impl {
($($tt:tt)*) => {
$crate::export::quote::quote!($($tt)*)
}; };
} }

46
third_party/rust/syn/src/path.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use punctuated::Punctuated; use punctuated::Punctuated;
@ -93,6 +85,13 @@ impl PathArguments {
PathArguments::Parenthesized(_) => false, PathArguments::Parenthesized(_) => false,
} }
} }
fn is_none(&self) -> bool {
match *self {
PathArguments::None => true,
PathArguments::AngleBracketed(_) | PathArguments::Parenthesized(_) => false,
}
}
} }
ast_enum! { ast_enum! {
@ -359,12 +358,9 @@ pub mod parsing {
/// ///
/// # Example /// # Example
/// ///
/// ``` /// ```edition2018
/// #[macro_use] /// use syn::{Path, Result, Token};
/// extern crate syn; /// use syn::parse::{Parse, ParseStream};
///
/// use syn::Path;
/// use syn::parse::{Parse, ParseStream, Result};
/// ///
/// // A simplified single `use` statement like: /// // A simplified single `use` statement like:
/// // /// //
@ -387,8 +383,6 @@ pub mod parsing {
/// }) /// })
/// } /// }
/// } /// }
/// #
/// # fn main() {}
/// ``` /// ```
pub fn parse_mod_style(input: ParseStream) -> Result<Self> { pub fn parse_mod_style(input: ParseStream) -> Result<Self> {
Ok(Path { Ok(Path {
@ -423,6 +417,26 @@ pub mod parsing {
}) })
} }
/// Determines whether this is a path of length 1 equal to the given
/// ident.
///
/// For them to compare equal, it must be the case that:
///
/// - the path has no leading colon,
/// - the number of path segments is 1,
/// - the first path segment has no angle bracketed or parenthesized
/// path arguments
/// - and the ident of the first path segment is equal to the given one.
pub fn is_ident<I>(&self, ident: I) -> bool
where
Ident: PartialEq<I>,
{
self.leading_colon.is_none()
&& self.segments.len() == 1
&& self.segments[0].arguments.is_none()
&& self.segments[0].ident == ident
}
fn parse_helper(input: ParseStream, expr_style: bool) -> Result<Self> { fn parse_helper(input: ParseStream, expr_style: bool) -> Result<Self> {
if input.peek(Token![dyn]) { if input.peek(Token![dyn]) {
return Err(input.error("expected path")); return Err(input.error("expected path"));

8
third_party/rust/syn/src/punctuated.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! A punctuated sequence of syntax tree nodes separated by punctuation. //! A punctuated sequence of syntax tree nodes separated by punctuation.
//! //!
//! Lots of things in Rust are punctuated sequences. //! Lots of things in Rust are punctuated sequences.

73
third_party/rust/syn/src/spanned.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! A trait that can provide the `Span` of the complete contents of a syntax //! A trait that can provide the `Span` of the complete contents of a syntax
//! tree node. //! tree node.
//! //!
@ -28,16 +20,12 @@
//! The following macro code takes a variable `ty` of type `Type` and produces a //! The following macro code takes a variable `ty` of type `Type` and produces a
//! static assertion that `Sync` is implemented for that type. //! static assertion that `Sync` is implemented for that type.
//! //!
//! ``` //! ```edition2018
//! # extern crate proc_macro; //! # extern crate proc_macro;
//! # extern crate proc_macro2;
//! # extern crate syn;
//! # //! #
//! #[macro_use]
//! extern crate quote;
//!
//! use proc_macro::TokenStream; //! use proc_macro::TokenStream;
//! use proc_macro2::Span; //! use proc_macro2::Span;
//! use quote::quote_spanned;
//! use syn::Type; //! use syn::Type;
//! use syn::spanned::Spanned; //! use syn::spanned::Spanned;
//! //!
@ -59,8 +47,6 @@
//! # fn get_a_type() -> Type { //! # fn get_a_type() -> Type {
//! # unimplemented!() //! # unimplemented!()
//! # } //! # }
//! #
//! # fn main() {}
//! ``` //! ```
//! //!
//! By inserting this `assert_sync` fragment into the output code generated by //! By inserting this `assert_sync` fragment into the output code generated by
@ -114,36 +100,45 @@ impl<T> Spanned for T
where where
T: ToTokens, T: ToTokens,
{ {
#[cfg(procmacro2_semver_exempt)]
fn span(&self) -> Span { fn span(&self) -> Span {
let mut tokens = TokenStream::new(); join_spans(self.into_token_stream())
self.to_tokens(&mut tokens); }
let mut iter = tokens.into_iter(); }
let mut span = match iter.next() {
Some(tt) => tt.span(), fn join_spans(tokens: TokenStream) -> Span {
None => { let mut iter = tokens.into_iter().filter_map(|tt| {
return Span::call_site(); // FIXME: This shouldn't be required, since optimally spans should
} // never be invalid. This filter_map can probably be removed when
}; // https://github.com/rust-lang/rust/issues/43081 is resolved.
for tt in iter { let span = tt.span();
if let Some(joined) = span.join(tt.span()) { let debug = format!("{:?}", span);
span = joined; if debug.ends_with("bytes(0..0)") {
None
} else {
Some(span)
}
});
let mut joined = match iter.next() {
Some(span) => span,
None => return Span::call_site(),
};
#[cfg(procmacro2_semver_exempt)]
{
for next in iter {
if let Some(span) = joined.join(next) {
joined = span;
} }
} }
span
} }
#[cfg(not(procmacro2_semver_exempt))] #[cfg(not(procmacro2_semver_exempt))]
fn span(&self) -> Span { {
let mut tokens = TokenStream::new();
self.to_tokens(&mut tokens);
let mut iter = tokens.into_iter();
// We can't join spans without procmacro2_semver_exempt so just grab the // We can't join spans without procmacro2_semver_exempt so just grab the
// first one. // first one.
match iter.next() { joined = joined;
Some(tt) => tt.span(),
None => Span::call_site(),
}
} }
joined
} }

81
third_party/rust/syn/src/thread.rs поставляемый Normal file
Просмотреть файл

@ -0,0 +1,81 @@
use std::fmt::{self, Debug};
use self::thread_id::ThreadId;
/// ThreadBound is a Sync-maker and Send-maker that allows accessing a value
/// of type T only from the original thread on which the ThreadBound was
/// constructed.
pub struct ThreadBound<T> {
value: T,
thread_id: ThreadId,
}
unsafe impl<T> Sync for ThreadBound<T> {}
// Send bound requires Copy, as otherwise Drop could run in the wrong place.
unsafe impl<T: Copy> Send for ThreadBound<T> {}
impl<T> ThreadBound<T> {
pub fn new(value: T) -> Self {
ThreadBound {
value: value,
thread_id: thread_id::current(),
}
}
pub fn get(&self) -> Option<&T> {
if thread_id::current() == self.thread_id {
Some(&self.value)
} else {
None
}
}
}
impl<T: Debug> Debug for ThreadBound<T> {
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self.get() {
Some(value) => Debug::fmt(value, formatter),
None => formatter.write_str("unknown"),
}
}
}
#[cfg(syn_can_use_thread_id)]
mod thread_id {
use std::thread;
pub use std::thread::ThreadId;
pub fn current() -> ThreadId {
thread::current().id()
}
}
#[cfg(not(syn_can_use_thread_id))]
mod thread_id {
use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
thread_local! {
static THREAD_ID: usize = {
static NEXT_THREAD_ID: AtomicUsize = ATOMIC_USIZE_INIT;
// Ordering::Relaxed because our only requirement for the ids is
// that they are unique. It is okay for the compiler to rearrange
// other memory reads around this fetch. It's still an atomic
// fetch_add, so no two threads will be able to read the same value
// from it.
//
// The main thing which these orderings affect is other memory reads
// around the atomic read, which for our case are irrelevant as this
// atomic guards nothing.
NEXT_THREAD_ID.fetch_add(1, Ordering::Relaxed)
};
}
pub type ThreadId = usize;
pub fn current() -> ThreadId {
THREAD_ID.with(|id| *id)
}
}

62
third_party/rust/syn/src/token.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! Tokens representing Rust punctuation, keywords, and delimiters. //! Tokens representing Rust punctuation, keywords, and delimiters.
//! //!
//! The type names in this module can be difficult to keep straight, so we //! The type names in this module can be difficult to keep straight, so we
@ -20,11 +12,8 @@
//! //!
//! [`ItemStatic`]: ../struct.ItemStatic.html //! [`ItemStatic`]: ../struct.ItemStatic.html
//! //!
//! ``` //! ```edition2018
//! # #[macro_use] //! # use syn::{Attribute, Expr, Ident, Token, Type, Visibility};
//! # extern crate syn;
//! #
//! # use syn::{Attribute, Expr, Ident, Type, Visibility};
//! # //! #
//! pub struct ItemStatic { //! pub struct ItemStatic {
//! pub attrs: Vec<Attribute>, //! pub attrs: Vec<Attribute>,
@ -38,8 +27,6 @@
//! pub expr: Box<Expr>, //! pub expr: Box<Expr>,
//! pub semi_token: Token![;], //! pub semi_token: Token![;],
//! } //! }
//! #
//! # fn main() {}
//! ``` //! ```
//! //!
//! # Parsing //! # Parsing
@ -53,11 +40,9 @@
//! [`bracketed!`]: ../macro.bracketed.html //! [`bracketed!`]: ../macro.bracketed.html
//! [`braced!`]: ../macro.braced.html //! [`braced!`]: ../macro.braced.html
//! //!
//! ``` //! ```edition2018
//! # extern crate syn; //! use syn::{Attribute, Result};
//! # //! use syn::parse::{Parse, ParseStream};
//! use syn::Attribute;
//! use syn::parse::{Parse, ParseStream, Result};
//! # //! #
//! # enum ItemStatic {} //! # enum ItemStatic {}
//! //!
@ -82,21 +67,15 @@
//! # unimplemented!() //! # unimplemented!()
//! } //! }
//! } //! }
//! #
//! # fn main() {}
//! ``` //! ```
use std; use std;
#[cfg(feature = "parsing")]
use std::cell::Cell;
#[cfg(feature = "extra-traits")] #[cfg(feature = "extra-traits")]
use std::cmp; use std::cmp;
#[cfg(feature = "extra-traits")] #[cfg(feature = "extra-traits")]
use std::fmt::{self, Debug}; use std::fmt::{self, Debug};
#[cfg(feature = "extra-traits")] #[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
#[cfg(feature = "parsing")]
use std::rc::Rc;
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
use proc_macro2::Delimiter; use proc_macro2::Delimiter;
@ -146,8 +125,12 @@ mod private {
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
impl private::Sealed for Ident {} impl private::Sealed for Ident {}
#[cfg(any(feature = "full", feature = "derive"))]
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
fn peek_impl(cursor: Cursor, peek: fn(ParseStream) -> bool) -> bool { fn peek_impl(cursor: Cursor, peek: fn(ParseStream) -> bool) -> bool {
use std::cell::Cell;
use std::rc::Rc;
let scope = Span::call_site(); let scope = Span::call_site();
let unexpected = Rc::new(Cell::new(None)); let unexpected = Rc::new(Cell::new(None));
let buffer = ::private::new_parse_buffer(scope, cursor, unexpected); let buffer = ::private::new_parse_buffer(scope, cursor, unexpected);
@ -272,7 +255,7 @@ macro_rules! define_keywords {
#[cfg(feature = "printing")] #[cfg(feature = "printing")]
impl ToTokens for $name { impl ToTokens for $name {
fn to_tokens(&self, tokens: &mut TokenStream) { fn to_tokens(&self, tokens: &mut TokenStream) {
printing::keyword($token, &self.span, tokens); printing::keyword($token, self.span, tokens);
} }
} }
@ -450,7 +433,7 @@ macro_rules! define_delimiters {
where where
F: FnOnce(&mut TokenStream), F: FnOnce(&mut TokenStream),
{ {
printing::delim($token, &self.span, tokens, f); printing::delim($token, self.span, tokens, f);
} }
} }
@ -562,7 +545,6 @@ define_keywords! {
"become" pub struct Become /// `become` "become" pub struct Become /// `become`
"box" pub struct Box /// `box` "box" pub struct Box /// `box`
"break" pub struct Break /// `break` "break" pub struct Break /// `break`
"Self" pub struct CapSelf /// `Self`
"const" pub struct Const /// `const` "const" pub struct Const /// `const`
"continue" pub struct Continue /// `continue` "continue" pub struct Continue /// `continue`
"crate" pub struct Crate /// `crate` "crate" pub struct Crate /// `crate`
@ -591,7 +573,8 @@ define_keywords! {
"pub" pub struct Pub /// `pub` "pub" pub struct Pub /// `pub`
"ref" pub struct Ref /// `ref` "ref" pub struct Ref /// `ref`
"return" pub struct Return /// `return` "return" pub struct Return /// `return`
"self" pub struct Self_ /// `self` "Self" pub struct SelfType /// `Self`
"self" pub struct SelfValue /// `self`
"static" pub struct Static /// `static` "static" pub struct Static /// `static`
"struct" pub struct Struct /// `struct` "struct" pub struct Struct /// `struct`
"super" pub struct Super /// `super` "super" pub struct Super /// `super`
@ -683,7 +666,6 @@ macro_rules! Token {
(become) => { $crate::token::Become }; (become) => { $crate::token::Become };
(box) => { $crate::token::Box }; (box) => { $crate::token::Box };
(break) => { $crate::token::Break }; (break) => { $crate::token::Break };
(Self) => { $crate::token::CapSelf };
(const) => { $crate::token::Const }; (const) => { $crate::token::Const };
(continue) => { $crate::token::Continue }; (continue) => { $crate::token::Continue };
(crate) => { $crate::token::Crate }; (crate) => { $crate::token::Crate };
@ -712,7 +694,8 @@ macro_rules! Token {
(pub) => { $crate::token::Pub }; (pub) => { $crate::token::Pub };
(ref) => { $crate::token::Ref }; (ref) => { $crate::token::Ref };
(return) => { $crate::token::Return }; (return) => { $crate::token::Return };
(self) => { $crate::token::Self_ }; (Self) => { $crate::token::SelfType };
(self) => { $crate::token::SelfValue };
(static) => { $crate::token::Static }; (static) => { $crate::token::Static };
(struct) => { $crate::token::Struct }; (struct) => { $crate::token::Struct };
(super) => { $crate::token::Super }; (super) => { $crate::token::Super };
@ -776,6 +759,13 @@ macro_rules! Token {
(_) => { $crate::token::Underscore }; (_) => { $crate::token::Underscore };
} }
// Old names. TODO: remove these re-exports in a breaking change.
// https://github.com/dtolnay/syn/issues/486
#[doc(hidden)]
pub use self::SelfType as CapSelf;
#[doc(hidden)]
pub use self::SelfValue as Self_;
#[cfg(feature = "parsing")] #[cfg(feature = "parsing")]
mod parsing { mod parsing {
use proc_macro2::{Spacing, Span}; use proc_macro2::{Spacing, Span};
@ -879,11 +869,11 @@ mod printing {
tokens.append(op); tokens.append(op);
} }
pub fn keyword(s: &str, span: &Span, tokens: &mut TokenStream) { pub fn keyword(s: &str, span: Span, tokens: &mut TokenStream) {
tokens.append(Ident::new(s, *span)); tokens.append(Ident::new(s, span));
} }
pub fn delim<F>(s: &str, span: &Span, tokens: &mut TokenStream, f: F) pub fn delim<F>(s: &str, span: Span, tokens: &mut TokenStream, f: F)
where where
F: FnOnce(&mut TokenStream), F: FnOnce(&mut TokenStream),
{ {
@ -897,7 +887,7 @@ mod printing {
let mut inner = TokenStream::new(); let mut inner = TokenStream::new();
f(&mut inner); f(&mut inner);
let mut g = Group::new(delim, inner); let mut g = Group::new(delim, inner);
g.set_span(*span); g.set_span(span);
tokens.append(g); tokens.append(g);
} }
} }

17
third_party/rust/syn/src/tt.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use proc_macro2::{Delimiter, TokenStream, TokenTree}; use proc_macro2::{Delimiter, TokenStream, TokenTree};
@ -41,10 +33,11 @@ impl<'a> PartialEq for TokenTreeHelper<'a> {
s2.next().is_none() s2.next().is_none()
} }
(&TokenTree::Punct(ref o1), &TokenTree::Punct(ref o2)) => { (&TokenTree::Punct(ref o1), &TokenTree::Punct(ref o2)) => {
o1.as_char() == o2.as_char() && match (o1.spacing(), o2.spacing()) { o1.as_char() == o2.as_char()
(Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true, && match (o1.spacing(), o2.spacing()) {
_ => false, (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
} _ => false,
}
} }
(&TokenTree::Literal(ref l1), &TokenTree::Literal(ref l2)) => { (&TokenTree::Literal(ref l1), &TokenTree::Literal(ref l2)) => {
l1.to_string() == l2.to_string() l1.to_string() == l2.to_string()

93
third_party/rust/syn/src/ty.rs поставляемый
Просмотреть файл

@ -1,11 +1,3 @@
// Copyright 2018 Syn Developers
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use super::*; use super::*;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use punctuated::Punctuated; use punctuated::Punctuated;
@ -308,9 +300,26 @@ pub mod parsing {
elem: Box::new(Type::TraitObject(content.parse()?)), elem: Box::new(Type::TraitObject(content.parse()?)),
})); }));
} }
if content.peek(Token![?]) {
return Ok(Type::TraitObject(TypeTraitObject {
dyn_token: None,
bounds: {
let mut bounds = Punctuated::new();
bounds.push_value(TypeParamBound::Trait(TraitBound {
paren_token: Some(paren_token),
..content.parse()?
}));
while let Some(plus) = input.parse()? {
bounds.push_punct(plus);
bounds.push_value(input.parse()?);
}
bounds
},
}));
}
let first: Type = content.parse()?; let first: Type = content.parse()?;
if content.peek(Token![,]) { if content.peek(Token![,]) {
Ok(Type::Tuple(TypeTuple { return Ok(Type::Tuple(TypeTuple {
paren_token: paren_token, paren_token: paren_token,
elems: { elems: {
let mut elems = Punctuated::new(); let mut elems = Punctuated::new();
@ -321,13 +330,61 @@ pub mod parsing {
elems.extend(rest); elems.extend(rest);
elems elems
}, },
})) }));
} else {
Ok(Type::Paren(TypeParen {
paren_token: paren_token,
elem: Box::new(first),
}))
} }
if allow_plus && input.peek(Token![+]) {
loop {
let first = match first {
Type::Path(TypePath { qself: None, path }) => {
TypeParamBound::Trait(TraitBound {
paren_token: Some(paren_token),
modifier: TraitBoundModifier::None,
lifetimes: None,
path: path,
})
}
Type::TraitObject(TypeTraitObject {
dyn_token: None,
ref bounds,
}) => {
if bounds.len() > 1 || bounds.trailing_punct() {
break;
}
match first {
Type::TraitObject(TypeTraitObject { bounds, .. }) => {
match bounds.into_iter().next().unwrap() {
TypeParamBound::Trait(trait_bound) => {
TypeParamBound::Trait(TraitBound {
paren_token: Some(paren_token),
..trait_bound
})
}
other => other,
}
}
_ => unreachable!(),
}
}
_ => break,
};
return Ok(Type::TraitObject(TypeTraitObject {
dyn_token: None,
bounds: {
let mut bounds = Punctuated::new();
bounds.push_value(first);
while let Some(plus) = input.parse()? {
bounds.push_punct(plus);
bounds.push_value(input.parse()?);
}
bounds
},
}));
}
}
Ok(Type::Paren(TypeParen {
paren_token: paren_token,
elem: Box::new(first),
}))
} else if lookahead.peek(Token![fn]) } else if lookahead.peek(Token![fn])
|| lookahead.peek(Token![unsafe]) || lookahead.peek(Token![unsafe])
|| lookahead.peek(Token![extern]) && !input.peek2(Token![::]) || lookahead.peek(Token![extern]) && !input.peek2(Token![::])
@ -398,6 +455,9 @@ pub mod parsing {
if allow_plus { if allow_plus {
while input.peek(Token![+]) { while input.peek(Token![+]) {
bounds.push_punct(input.parse()?); bounds.push_punct(input.parse()?);
if input.peek(Token![>]) {
break;
}
bounds.push_value(input.parse()?); bounds.push_value(input.parse()?);
} }
} }
@ -640,6 +700,9 @@ pub mod parsing {
break; break;
} }
bounds.push_punct(input.parse()?); bounds.push_punct(input.parse()?);
if input.peek(Token![>]) {
break;
}
} }
} else { } else {
bounds.push_value(input.parse()?); bounds.push_value(input.parse()?);

175
toolkit/content/tests/chrome/test_menulist.xul
Просмотреть файл

@ -21,7 +21,7 @@
<richlistbox id="scroller-in-listbox" style="overflow: auto" height="60"> <richlistbox id="scroller-in-listbox" style="overflow: auto" height="60">
<richlistitem allowevents="true"> <richlistitem allowevents="true">
<menulist id="menulist-in-listbox" onpopupshown="test_menulist_open(this, this.parentNode.parentNode)" <menulist id="menulist-in-listbox" onpopupshown="test_menulist_open(this, this.parentNode.parentNode)"
onpopuphidden="SimpleTest.executeSoon(checkScrollAndFinish)"> onpopuphidden="SimpleTest.executeSoon(() => checkScrollAndFinish().catch(ex => ok(false, ex)));">
<menupopup id="menulist-in-listbox-popup"> <menupopup id="menulist-in-listbox-popup">
<menuitem label="One" value="one"/> <menuitem label="One" value="one"/>
<menuitem label="Two" value="two"/> <menuitem label="Two" value="two"/>
@ -74,6 +74,18 @@
<script class="testbody" type="application/javascript"> <script class="testbody" type="application/javascript">
<![CDATA[ <![CDATA[
function waitForEvent(subject, eventName, checkFn) {
return new Promise(resolve => {
subject.addEventListener(eventName, function listener(event) {
if (checkFn && !checkFn(event)) {
return;
}
subject.removeEventListener(eventName, listener);
SimpleTest.executeSoon(() => resolve(event));
});
});
}
SimpleTest.waitForExplicitFinish(); SimpleTest.waitForExplicitFinish();
function testtag_menulists() function testtag_menulists()
@ -225,92 +237,105 @@ function test_menulist_open(element, scroller)
element.open = false; element.open = false;
} }
function checkScrollAndFinish() async function checkScrollAndFinish()
{ {
is($("scroller").scrollTop, 0, "mousewheel on menulist does not scroll vbox parent"); is($("scroller").scrollTop, 0, "mousewheel on menulist does not scroll vbox parent");
is($("scroller-in-listbox").scrollTop, 0, "mousewheel on menulist does not scroll listbox parent"); is($("scroller-in-listbox").scrollTop, 0, "mousewheel on menulist does not scroll listbox parent");
let menulist = $("menulist-size"); let menulist = $("menulist-size");
menulist.addEventListener("popupshown", function testAltClose() { let shownPromise = waitForEvent(menulist, "popupshown");
menulist.removeEventListener("popupshown", testAltClose);
sendKey("ALT");
is(menulist.menupopup.state, "open", "alt doesn't close menulist");
menulist.open = false;
dragScroll();
});
menulist.open = true; menulist.open = true;
await shownPromise;
sendKey("ALT");
is(menulist.menupopup.state, "open", "alt doesn't close menulist");
menulist.open = false;
await dragScroll();
} }
function dragScroll() async function dragScroll()
{ {
let menulist = $("menulist-clipped"); let menulist = $("menulist-clipped");
menulist.addEventListener("popupshown", function testDragScroll() {
menulist.removeEventListener("popupshown", testDragScroll);
let popup = menulist.menupopup;
let scrollPos = popup.scrollBox.scrollTop;
let popupRect = popup.getBoundingClientRect();
// First, check that scrolling does not occur when the mouse is moved over the
// anchor button but not the popup yet.
synthesizeMouseAtPoint(popupRect.left + 5, popupRect.top - 10, { type: "mousemove" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position after mousemove over button should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top + 10, { type: "mousemove" });
// Dragging above the popup scrolls it up.
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" });
ok(popup.scrollBox.scrollTop < scrollPos - 5, "scroll position at drag up");
// Dragging below the popup scrolls it down.
scrollPos = popup.scrollBox.scrollTop;
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
ok(popup.scrollBox.scrollTop > scrollPos + 5, "scroll position at drag down");
// Releasing the mouse button and moving the mouse does not change the scroll position.
scrollPos = popup.scrollBox.scrollTop;
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position at mouseup should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position at mousemove after mouseup should not change");
// Now check dragging with a mousedown on an item
let menuRect = popup.childNodes[4].getBoundingClientRect();
synthesizeMouseAtPoint(menuRect.left + 5, menuRect.top + 5, { type: "mousedown" });
// Dragging below the popup scrolls it down.
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
ok(popup.scrollBox.scrollTop > scrollPos + 5, "scroll position at drag down from item");
// Dragging above the popup scrolls it up.
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position at drag up from item");
scrollPos = popup.scrollBox.scrollTop;
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position at mouseup should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
is(popup.scrollBox.scrollTop, scrollPos, "scroll position at mousemove after mouseup should not change");
menulist.open = false;
let mouseMoveTarget = null;
popup.childNodes[4].click();
addEventListener("mousemove", function checkMouseMove(event) {
mouseMoveTarget = event.target;
}, {once: true});
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
isnot(mouseMoveTarget, popup, "clicking on item when popup closed doesn't start dragging");
SimpleTest.finish();
});
let shownPromise = waitForEvent(menulist, "popupshown");
menulist.open = true; menulist.open = true;
await shownPromise;
let popup = menulist.menupopup;
let getScrollPos = () => popup.scrollBox.scrollbox.scrollTop;
let scrollPos = getScrollPos();
let popupRect = popup.getBoundingClientRect();
// First, check that scrolling does not occur when the mouse is moved over the
// anchor button but not the popup yet.
synthesizeMouseAtPoint(popupRect.left + 5, popupRect.top - 10, { type: "mousemove" });
is(getScrollPos(), scrollPos, "scroll position after mousemove over button should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top + 10, { type: "mousemove" });
// Dragging above the popup scrolls it up.
let scrolledPromise = waitForEvent(popup, "scroll", false,
() => getScrollPos() < scrollPos - 5);
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" });
await scrolledPromise;
ok(true, "scroll position at drag up");
// Dragging below the popup scrolls it down.
scrollPos = getScrollPos();
scrolledPromise = waitForEvent(popup, "scroll", false,
() => getScrollPos() > scrollPos + 5);
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
await scrolledPromise;
ok(true, "scroll position at drag down");
// Releasing the mouse button and moving the mouse does not change the scroll position.
scrollPos = getScrollPos();
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" });
is(getScrollPos(), scrollPos, "scroll position at mouseup should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
is(getScrollPos(), scrollPos, "scroll position at mousemove after mouseup should not change");
// Now check dragging with a mousedown on an item. Make sure the element is
// visible, as the asynchronous scrolling may have moved it out of view.
popup.childNodes[4].scrollIntoView({ block: "nearest", behavior: "instant" });
let menuRect = popup.childNodes[4].getBoundingClientRect();
synthesizeMouseAtPoint(menuRect.left + 5, menuRect.top + 5, { type: "mousedown" });
// Dragging below the popup scrolls it down.
scrolledPromise = waitForEvent(popup, "scroll", false,
() => getScrollPos() > scrollPos + 5);
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
await scrolledPromise;
ok(true, "scroll position at drag down from item");
// Dragging above the popup scrolls it up.
scrollPos = getScrollPos();
scrolledPromise = waitForEvent(popup, "scroll", false,
() => getScrollPos() < scrollPos - 5);
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.top - 20, { type: "mousemove" });
await scrolledPromise;
ok(true, "scroll position at drag up from item");
scrollPos = getScrollPos();
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 25, { type: "mouseup" });
is(getScrollPos(), scrollPos, "scroll position at mouseup should not change");
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
is(getScrollPos(), scrollPos, "scroll position at mousemove after mouseup should not change");
menulist.open = false;
let mouseMoveTarget = null;
popup.childNodes[4].click();
addEventListener("mousemove", function checkMouseMove(event) {
mouseMoveTarget = event.target;
}, {once: true});
synthesizeMouseAtPoint(popupRect.left + 20, popupRect.bottom + 20, { type: "mousemove" });
isnot(mouseMoveTarget, popup, "clicking on item when popup closed doesn't start dragging");
SimpleTest.finish();
} }
]]> ]]>

2
toolkit/content/tests/chrome/test_mousescroll.xul
Просмотреть файл

@ -149,7 +149,7 @@ function* testRichListbox(id)
function* testArrowScrollbox(id) function* testArrowScrollbox(id)
{ {
var scrollbox = document.getElementById(id)._scrollbox; var scrollbox = document.getElementById(id).scrollbox;
var orient = scrollbox.getAttribute("orient"); var orient = scrollbox.getAttribute("orient");
function* helper(aStart, aDelta, aDeltaMode, aExpected) function* helper(aStart, aDelta, aDeltaMode, aExpected)

2
toolkit/content/tests/chrome/window_largemenu.xul
Просмотреть файл

@ -103,7 +103,7 @@ function popupShown()
var popup = document.getElementById("popup"); var popup = document.getElementById("popup");
var rect = popup.getBoundingClientRect(); var rect = popup.getBoundingClientRect();
var scrollbox = document.getAnonymousNodes(popup)[0]._scrollbox; var scrollbox = document.getAnonymousNodes(popup)[0].scrollbox;
var expectedScrollPos = 0; var expectedScrollPos = 0;
if (gTestIndex == 0) { if (gTestIndex == 0) {

9
toolkit/content/widgets/popup.xml
Просмотреть файл

@ -265,9 +265,10 @@
<binding id="popup-scrollbars" extends="chrome://global/content/bindings/popup.xml#popup"> <binding id="popup-scrollbars" extends="chrome://global/content/bindings/popup.xml#popup">
<content> <content>
<xul:scrollbox class="popup-internal-box" flex="1" orient="vertical" style="overflow: auto;"> <xul:arrowscrollbox class="popup-internal-box" flex="1" orient="vertical"
smoothscroll="false">
<children/> <children/>
</xul:scrollbox> </xul:arrowscrollbox>
</content> </content>
<implementation> <implementation>
<field name="AUTOSCROLL_INTERVAL">25</field> <field name="AUTOSCROLL_INTERVAL">25</field>
@ -368,11 +369,11 @@
if (this._draggingState == this.DRAG_OVER_POPUP && if (this._draggingState == this.DRAG_OVER_POPUP &&
(event.screenY <= popupRect.top || event.screenY >= popupRect.bottom)) { (event.screenY <= popupRect.top || event.screenY >= popupRect.bottom)) {
let scrollAmount = event.screenY <= popupRect.top ? -1 : 1; let scrollAmount = event.screenY <= popupRect.top ? -1 : 1;
this.scrollBox.scrollByIndex(scrollAmount); this.scrollBox.scrollByIndex(scrollAmount, true);
let win = this.ownerGlobal; let win = this.ownerGlobal;
this._scrollTimer = win.setInterval(() => { this._scrollTimer = win.setInterval(() => {
this.scrollBox.scrollByIndex(scrollAmount); this.scrollBox.scrollByIndex(scrollAmount, true);
}, this.AUTOSCROLL_INTERVAL); }, this.AUTOSCROLL_INTERVAL);
} }
} }

34
toolkit/content/widgets/scrollbox.xml
Просмотреть файл

@ -66,7 +66,7 @@
} }
]]></destructor> ]]></destructor>
<field name="_scrollbox"> <field name="scrollbox">
document.getAnonymousElementByAttribute(this, "anonid", "scrollbox"); document.getAnonymousElementByAttribute(this, "anonid", "scrollbox");
</field> </field>
<field name="_scrollButtonUp"> <field name="_scrollButtonUp">
@ -153,29 +153,29 @@
<property name="scrollBoxObject" readonly="true"> <property name="scrollBoxObject" readonly="true">
<getter><![CDATA[ <getter><![CDATA[
return this._scrollbox.boxObject; return this.scrollbox.boxObject;
]]></getter> ]]></getter>
</property> </property>
<property name="scrollClientRect" readonly="true"> <property name="scrollClientRect" readonly="true">
<getter><![CDATA[ <getter><![CDATA[
return this._scrollbox.getBoundingClientRect(); return this.scrollbox.getBoundingClientRect();
]]></getter> ]]></getter>
</property> </property>
<property name="scrollClientSize" readonly="true"> <property name="scrollClientSize" readonly="true">
<getter><![CDATA[ <getter><![CDATA[
return this.orient == "vertical" ? return this.orient == "vertical" ?
this._scrollbox.clientHeight : this.scrollbox.clientHeight :
this._scrollbox.clientWidth; this.scrollbox.clientWidth;
]]></getter> ]]></getter>
</property> </property>
<property name="scrollSize" readonly="true"> <property name="scrollSize" readonly="true">
<getter><![CDATA[ <getter><![CDATA[
return this.orient == "vertical" ? return this.orient == "vertical" ?
this._scrollbox.scrollHeight : this.scrollbox.scrollHeight :
this._scrollbox.scrollWidth; this.scrollbox.scrollWidth;
]]></getter> ]]></getter>
</property> </property>
@ -193,8 +193,8 @@
<property name="scrollPosition" readonly="true"> <property name="scrollPosition" readonly="true">
<getter><![CDATA[ <getter><![CDATA[
return this.orient == "vertical" ? return this.orient == "vertical" ?
this._scrollbox.scrollTop : this.scrollbox.scrollTop :
this._scrollbox.scrollLeft; this.scrollbox.scrollLeft;
]]></getter> ]]></getter>
</property> </property>
@ -204,7 +204,7 @@
<field name="_isRTLScrollbox"><![CDATA[ <field name="_isRTLScrollbox"><![CDATA[
this.orient != "vertical" && this.orient != "vertical" &&
document.defaultView.getComputedStyle(this._scrollbox).direction == "rtl"; document.defaultView.getComputedStyle(this.scrollbox).direction == "rtl";
]]></field> ]]></field>
<method name="_onButtonClick"> <method name="_onButtonClick">
@ -298,7 +298,8 @@
window.cancelAnimationFrame(this._ensureElementIsVisibleAnimationFrame); window.cancelAnimationFrame(this._ensureElementIsVisibleAnimationFrame);
} }
this._ensureElementIsVisibleAnimationFrame = window.requestAnimationFrame(() => { this._ensureElementIsVisibleAnimationFrame = window.requestAnimationFrame(() => {
element.scrollIntoView({ behavior: aInstant ? "instant" : "auto" }); element.scrollIntoView({ block: "nearest",
behavior: aInstant ? "instant" : "auto" });
this._ensureElementIsVisibleAnimationFrame = 0; this._ensureElementIsVisibleAnimationFrame = 0;
}); });
]]></body> ]]></body>
@ -538,7 +539,7 @@
<body><![CDATA[ <body><![CDATA[
let scrollOptions = { behavior: aInstant ? "instant" : "auto" }; let scrollOptions = { behavior: aInstant ? "instant" : "auto" };
scrollOptions[this._startEndProps[0]] = aPixels; scrollOptions[this._startEndProps[0]] = aPixels;
this._scrollbox.scrollBy(scrollOptions); this.scrollbox.scrollBy(scrollOptions);
]]></body> ]]></body>
</method> </method>
@ -564,6 +565,11 @@
// getBoundsWithoutFlushing. // getBoundsWithoutFlushing.
window.requestAnimationFrame(() => { window.requestAnimationFrame(() => {
setTimeout(() => { setTimeout(() => {
if (!this._startEndProps) {
// We've been destroyed in the meantime.
return;
}
this._scrollButtonUpdatePending = false; this._scrollButtonUpdatePending = false;
let scrolledToStart = false; let scrolledToStart = false;
@ -584,11 +590,11 @@
} }
if (leftOrTopElement && if (leftOrTopElement &&
leftOrTopEdge(leftOrTopElement) >= leftOrTopEdge(this._scrollbox)) { leftOrTopEdge(leftOrTopElement) >= leftOrTopEdge(this.scrollbox)) {
scrolledToStart = !this._isRTLScrollbox; scrolledToStart = !this._isRTLScrollbox;
scrolledToEnd = this._isRTLScrollbox; scrolledToEnd = this._isRTLScrollbox;
} else if (rightOrBottomElement && } else if (rightOrBottomElement &&
rightOrBottomEdge(rightOrBottomElement) <= rightOrBottomEdge(this._scrollbox)) { rightOrBottomEdge(rightOrBottomElement) <= rightOrBottomEdge(this.scrollbox)) {
scrolledToStart = this._isRTLScrollbox; scrolledToStart = this._isRTLScrollbox;
scrolledToEnd = !this._isRTLScrollbox; scrolledToEnd = !this._isRTLScrollbox;
} }

11
toolkit/content/xul.css
Просмотреть файл

@ -636,6 +636,17 @@ menulist > menupopup > menuitem {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel"); -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
} }
menulist > menupopup > .popup-internal-box > .scrollbutton-up,
menulist > menupopup > .popup-internal-box > .arrowscrollbox-overflow-start-indicator,
menulist > menupopup > .popup-internal-box > .arrowscrollbox-overflow-end-indicator,
menulist > menupopup > .popup-internal-box > .scrollbutton-down {
display: none;
}
menulist > menupopup > .popup-internal-box > .arrowscrollbox-scrollbox {
overflow: auto;
}
dropmarker > .dropmarker-icon { dropmarker > .dropmarker-icon {
pointer-events: none; pointer-events: none;
} }

2
toolkit/modules/SelectParentHelper.jsm
Просмотреть файл

@ -245,7 +245,7 @@ var SelectParentHelper = {
return; return;
} }
let scrollBox = currentMenulist.menupopup.scrollBox; let scrollBox = currentMenulist.menupopup.scrollBox.scrollbox;
let scrollTop = scrollBox.scrollTop; let scrollTop = scrollBox.scrollTop;
let options = msg.data.options; let options = msg.data.options;