diff options
-rw-r--r-- | crates/ra_hir/src/expr.rs | 18 | ||||
-rw-r--r-- | crates/ra_hir/src/ty.rs | 2 | ||||
-rw-r--r-- | editors/code/package-lock.json | 90 |
3 files changed, 54 insertions, 56 deletions
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs index 2696592a4..5081466a2 100644 --- a/crates/ra_hir/src/expr.rs +++ b/crates/ra_hir/src/expr.rs | |||
@@ -661,22 +661,20 @@ impl ExprCollector { | |||
661 | .map(|s| Name::new(s)) | 661 | .map(|s| Name::new(s)) |
662 | .and_then(|name| UncertainIntTy::from_name(&name)); | 662 | .and_then(|name| UncertainIntTy::from_name(&name)); |
663 | 663 | ||
664 | if let Some(kn) = known_name { | 664 | Literal::Int( |
665 | Literal::Int(Default::default(), kn) | 665 | Default::default(), |
666 | } else { | 666 | known_name.unwrap_or(UncertainIntTy::Unknown), |
667 | Literal::Int(Default::default(), UncertainIntTy::Unknown) | 667 | ) |
668 | } | ||
669 | } | 668 | } |
670 | LiteralFlavor::FloatNumber { suffix } => { | 669 | LiteralFlavor::FloatNumber { suffix } => { |
671 | let known_name = suffix | 670 | let known_name = suffix |
672 | .map(|s| Name::new(s)) | 671 | .map(|s| Name::new(s)) |
673 | .and_then(|name| UncertainFloatTy::from_name(&name)); | 672 | .and_then(|name| UncertainFloatTy::from_name(&name)); |
674 | 673 | ||
675 | if let Some(kn) = known_name { | 674 | Literal::Float( |
676 | Literal::Float(Default::default(), kn) | 675 | Default::default(), |
677 | } else { | 676 | known_name.unwrap_or(UncertainFloatTy::Unknown), |
678 | Literal::Float(Default::default(), UncertainFloatTy::Unknown) | 677 | ) |
679 | } | ||
680 | } | 678 | } |
681 | LiteralFlavor::ByteString => Literal::ByteString(Default::default()), | 679 | LiteralFlavor::ByteString => Literal::ByteString(Default::default()), |
682 | LiteralFlavor::String => Literal::String(Default::default()), | 680 | LiteralFlavor::String => Literal::String(Default::default()), |
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index b6577ee5e..5579db8fb 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -107,7 +107,7 @@ impl UnifyValue for TypeVarValue { | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | /// The kinds of placeholders we need during type inference. There's seperate | 110 | /// The kinds of placeholders we need during type inference. There's separate |
111 | /// values for general types, and for integer and float variables. The latter | 111 | /// values for general types, and for integer and float variables. The latter |
112 | /// two are used for inference of literal values (e.g. `100` could be one of | 112 | /// two are used for inference of literal values (e.g. `100` could be one of |
113 | /// several integer types). | 113 | /// several integer types). |
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index a36fb2f1c..86313d4cc 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json | |||
@@ -183,7 +183,7 @@ | |||
183 | "dependencies": { | 183 | "dependencies": { |
184 | "chalk": { | 184 | "chalk": { |
185 | "version": "1.1.3", | 185 | "version": "1.1.3", |
186 | "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", | 186 | "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", |
187 | "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", | 187 | "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", |
188 | "dev": true, | 188 | "dev": true, |
189 | "requires": { | 189 | "requires": { |
@@ -348,7 +348,7 @@ | |||
348 | "dependencies": { | 348 | "dependencies": { |
349 | "readable-stream": { | 349 | "readable-stream": { |
350 | "version": "2.3.6", | 350 | "version": "2.3.6", |
351 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 351 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
352 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 352 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
353 | "dev": true, | 353 | "dev": true, |
354 | "requires": { | 354 | "requires": { |
@@ -363,7 +363,7 @@ | |||
363 | }, | 363 | }, |
364 | "string_decoder": { | 364 | "string_decoder": { |
365 | "version": "1.1.1", | 365 | "version": "1.1.1", |
366 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 366 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
367 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 367 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
368 | "dev": true, | 368 | "dev": true, |
369 | "requires": { | 369 | "requires": { |
@@ -425,7 +425,7 @@ | |||
425 | }, | 425 | }, |
426 | "css-select": { | 426 | "css-select": { |
427 | "version": "1.2.0", | 427 | "version": "1.2.0", |
428 | "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", | 428 | "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", |
429 | "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", | 429 | "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", |
430 | "dev": true, | 430 | "dev": true, |
431 | "requires": { | 431 | "requires": { |
@@ -461,7 +461,7 @@ | |||
461 | }, | 461 | }, |
462 | "deep-assign": { | 462 | "deep-assign": { |
463 | "version": "1.0.0", | 463 | "version": "1.0.0", |
464 | "resolved": "http://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz", | 464 | "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz", |
465 | "integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=", | 465 | "integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=", |
466 | "dev": true, | 466 | "dev": true, |
467 | "requires": { | 467 | "requires": { |
@@ -507,7 +507,7 @@ | |||
507 | "dependencies": { | 507 | "dependencies": { |
508 | "domelementtype": { | 508 | "domelementtype": { |
509 | "version": "1.1.3", | 509 | "version": "1.1.3", |
510 | "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", | 510 | "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", |
511 | "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", | 511 | "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", |
512 | "dev": true | 512 | "dev": true |
513 | } | 513 | } |
@@ -540,7 +540,7 @@ | |||
540 | }, | 540 | }, |
541 | "duplexer": { | 541 | "duplexer": { |
542 | "version": "0.1.1", | 542 | "version": "0.1.1", |
543 | "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", | 543 | "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", |
544 | "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", | 544 | "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", |
545 | "dev": true | 545 | "dev": true |
546 | }, | 546 | }, |
@@ -558,7 +558,7 @@ | |||
558 | "dependencies": { | 558 | "dependencies": { |
559 | "readable-stream": { | 559 | "readable-stream": { |
560 | "version": "2.3.6", | 560 | "version": "2.3.6", |
561 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 561 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
562 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 562 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
563 | "dev": true, | 563 | "dev": true, |
564 | "requires": { | 564 | "requires": { |
@@ -573,7 +573,7 @@ | |||
573 | }, | 573 | }, |
574 | "string_decoder": { | 574 | "string_decoder": { |
575 | "version": "1.1.1", | 575 | "version": "1.1.1", |
576 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 576 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
577 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 577 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
578 | "dev": true, | 578 | "dev": true, |
579 | "requires": { | 579 | "requires": { |
@@ -627,7 +627,7 @@ | |||
627 | }, | 627 | }, |
628 | "event-stream": { | 628 | "event-stream": { |
629 | "version": "3.3.4", | 629 | "version": "3.3.4", |
630 | "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", | 630 | "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", |
631 | "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", | 631 | "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", |
632 | "dev": true, | 632 | "dev": true, |
633 | "requires": { | 633 | "requires": { |
@@ -694,7 +694,7 @@ | |||
694 | "dependencies": { | 694 | "dependencies": { |
695 | "readable-stream": { | 695 | "readable-stream": { |
696 | "version": "2.3.6", | 696 | "version": "2.3.6", |
697 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 697 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
698 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 698 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
699 | "dev": true, | 699 | "dev": true, |
700 | "requires": { | 700 | "requires": { |
@@ -709,7 +709,7 @@ | |||
709 | }, | 709 | }, |
710 | "string_decoder": { | 710 | "string_decoder": { |
711 | "version": "1.1.1", | 711 | "version": "1.1.1", |
712 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 712 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
713 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 713 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
714 | "dev": true, | 714 | "dev": true, |
715 | "requires": { | 715 | "requires": { |
@@ -828,7 +828,7 @@ | |||
828 | "dependencies": { | 828 | "dependencies": { |
829 | "readable-stream": { | 829 | "readable-stream": { |
830 | "version": "2.3.6", | 830 | "version": "2.3.6", |
831 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 831 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
832 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 832 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
833 | "dev": true, | 833 | "dev": true, |
834 | "requires": { | 834 | "requires": { |
@@ -843,7 +843,7 @@ | |||
843 | }, | 843 | }, |
844 | "string_decoder": { | 844 | "string_decoder": { |
845 | "version": "1.1.1", | 845 | "version": "1.1.1", |
846 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 846 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
847 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 847 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
848 | "dev": true, | 848 | "dev": true, |
849 | "requires": { | 849 | "requires": { |
@@ -904,7 +904,7 @@ | |||
904 | }, | 904 | }, |
905 | "readable-stream": { | 905 | "readable-stream": { |
906 | "version": "1.0.34", | 906 | "version": "1.0.34", |
907 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", | 907 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", |
908 | "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", | 908 | "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", |
909 | "dev": true, | 909 | "dev": true, |
910 | "requires": { | 910 | "requires": { |
@@ -916,13 +916,13 @@ | |||
916 | }, | 916 | }, |
917 | "string_decoder": { | 917 | "string_decoder": { |
918 | "version": "0.10.31", | 918 | "version": "0.10.31", |
919 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", | 919 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", |
920 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", | 920 | "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", |
921 | "dev": true | 921 | "dev": true |
922 | }, | 922 | }, |
923 | "through2": { | 923 | "through2": { |
924 | "version": "0.6.5", | 924 | "version": "0.6.5", |
925 | "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", | 925 | "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", |
926 | "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", | 926 | "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", |
927 | "dev": true, | 927 | "dev": true, |
928 | "requires": { | 928 | "requires": { |
@@ -1192,7 +1192,7 @@ | |||
1192 | }, | 1192 | }, |
1193 | "is-obj": { | 1193 | "is-obj": { |
1194 | "version": "1.0.1", | 1194 | "version": "1.0.1", |
1195 | "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", | 1195 | "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", |
1196 | "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", | 1196 | "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", |
1197 | "dev": true | 1197 | "dev": true |
1198 | }, | 1198 | }, |
@@ -1319,7 +1319,7 @@ | |||
1319 | }, | 1319 | }, |
1320 | "kind-of": { | 1320 | "kind-of": { |
1321 | "version": "1.1.0", | 1321 | "version": "1.1.0", |
1322 | "resolved": "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", | 1322 | "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", |
1323 | "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", | 1323 | "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", |
1324 | "dev": true | 1324 | "dev": true |
1325 | }, | 1325 | }, |
@@ -1334,7 +1334,7 @@ | |||
1334 | "dependencies": { | 1334 | "dependencies": { |
1335 | "readable-stream": { | 1335 | "readable-stream": { |
1336 | "version": "2.3.6", | 1336 | "version": "2.3.6", |
1337 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 1337 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
1338 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 1338 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
1339 | "dev": true, | 1339 | "dev": true, |
1340 | "requires": { | 1340 | "requires": { |
@@ -1349,7 +1349,7 @@ | |||
1349 | }, | 1349 | }, |
1350 | "string_decoder": { | 1350 | "string_decoder": { |
1351 | "version": "1.1.1", | 1351 | "version": "1.1.1", |
1352 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 1352 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
1353 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 1353 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
1354 | "dev": true, | 1354 | "dev": true, |
1355 | "requires": { | 1355 | "requires": { |
@@ -1384,7 +1384,7 @@ | |||
1384 | }, | 1384 | }, |
1385 | "map-stream": { | 1385 | "map-stream": { |
1386 | "version": "0.1.0", | 1386 | "version": "0.1.0", |
1387 | "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", | 1387 | "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", |
1388 | "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", | 1388 | "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", |
1389 | "dev": true | 1389 | "dev": true |
1390 | }, | 1390 | }, |
@@ -1439,13 +1439,13 @@ | |||
1439 | }, | 1439 | }, |
1440 | "minimist": { | 1440 | "minimist": { |
1441 | "version": "0.0.8", | 1441 | "version": "0.0.8", |
1442 | "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", | 1442 | "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", |
1443 | "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", | 1443 | "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", |
1444 | "dev": true | 1444 | "dev": true |
1445 | }, | 1445 | }, |
1446 | "mkdirp": { | 1446 | "mkdirp": { |
1447 | "version": "0.5.1", | 1447 | "version": "0.5.1", |
1448 | "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", | 1448 | "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", |
1449 | "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", | 1449 | "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", |
1450 | "dev": true, | 1450 | "dev": true, |
1451 | "requires": { | 1451 | "requires": { |
@@ -1618,7 +1618,7 @@ | |||
1618 | "dependencies": { | 1618 | "dependencies": { |
1619 | "readable-stream": { | 1619 | "readable-stream": { |
1620 | "version": "2.3.6", | 1620 | "version": "2.3.6", |
1621 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 1621 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
1622 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 1622 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
1623 | "dev": true, | 1623 | "dev": true, |
1624 | "requires": { | 1624 | "requires": { |
@@ -1633,7 +1633,7 @@ | |||
1633 | }, | 1633 | }, |
1634 | "string_decoder": { | 1634 | "string_decoder": { |
1635 | "version": "1.1.1", | 1635 | "version": "1.1.1", |
1636 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 1636 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
1637 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 1637 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
1638 | "dev": true, | 1638 | "dev": true, |
1639 | "requires": { | 1639 | "requires": { |
@@ -1644,13 +1644,13 @@ | |||
1644 | }, | 1644 | }, |
1645 | "os-homedir": { | 1645 | "os-homedir": { |
1646 | "version": "1.0.2", | 1646 | "version": "1.0.2", |
1647 | "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", | 1647 | "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", |
1648 | "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", | 1648 | "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", |
1649 | "dev": true | 1649 | "dev": true |
1650 | }, | 1650 | }, |
1651 | "os-tmpdir": { | 1651 | "os-tmpdir": { |
1652 | "version": "1.0.2", | 1652 | "version": "1.0.2", |
1653 | "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", | 1653 | "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", |
1654 | "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", | 1654 | "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", |
1655 | "dev": true | 1655 | "dev": true |
1656 | }, | 1656 | }, |
@@ -1666,7 +1666,7 @@ | |||
1666 | }, | 1666 | }, |
1667 | "parse-semver": { | 1667 | "parse-semver": { |
1668 | "version": "1.1.1", | 1668 | "version": "1.1.1", |
1669 | "resolved": "http://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz", | 1669 | "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz", |
1670 | "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=", | 1670 | "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=", |
1671 | "dev": true, | 1671 | "dev": true, |
1672 | "requires": { | 1672 | "requires": { |
@@ -1690,7 +1690,7 @@ | |||
1690 | }, | 1690 | }, |
1691 | "path-is-absolute": { | 1691 | "path-is-absolute": { |
1692 | "version": "1.0.1", | 1692 | "version": "1.0.1", |
1693 | "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", | 1693 | "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", |
1694 | "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", | 1694 | "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", |
1695 | "dev": true | 1695 | "dev": true |
1696 | }, | 1696 | }, |
@@ -1702,7 +1702,7 @@ | |||
1702 | }, | 1702 | }, |
1703 | "pause-stream": { | 1703 | "pause-stream": { |
1704 | "version": "0.0.11", | 1704 | "version": "0.0.11", |
1705 | "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", | 1705 | "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", |
1706 | "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", | 1706 | "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", |
1707 | "dev": true, | 1707 | "dev": true, |
1708 | "requires": { | 1708 | "requires": { |
@@ -1955,7 +1955,7 @@ | |||
1955 | }, | 1955 | }, |
1956 | "split": { | 1956 | "split": { |
1957 | "version": "0.3.3", | 1957 | "version": "0.3.3", |
1958 | "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz", | 1958 | "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", |
1959 | "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", | 1959 | "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", |
1960 | "dev": true, | 1960 | "dev": true, |
1961 | "requires": { | 1961 | "requires": { |
@@ -1964,7 +1964,7 @@ | |||
1964 | }, | 1964 | }, |
1965 | "sprintf-js": { | 1965 | "sprintf-js": { |
1966 | "version": "1.0.3", | 1966 | "version": "1.0.3", |
1967 | "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", | 1967 | "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", |
1968 | "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", | 1968 | "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", |
1969 | "dev": true | 1969 | "dev": true |
1970 | }, | 1970 | }, |
@@ -1993,7 +1993,7 @@ | |||
1993 | }, | 1993 | }, |
1994 | "stream-combiner": { | 1994 | "stream-combiner": { |
1995 | "version": "0.0.4", | 1995 | "version": "0.0.4", |
1996 | "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", | 1996 | "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", |
1997 | "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", | 1997 | "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", |
1998 | "dev": true, | 1998 | "dev": true, |
1999 | "requires": { | 1999 | "requires": { |
@@ -2017,7 +2017,7 @@ | |||
2017 | "dependencies": { | 2017 | "dependencies": { |
2018 | "readable-stream": { | 2018 | "readable-stream": { |
2019 | "version": "2.3.6", | 2019 | "version": "2.3.6", |
2020 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 2020 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
2021 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 2021 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
2022 | "dev": true, | 2022 | "dev": true, |
2023 | "requires": { | 2023 | "requires": { |
@@ -2032,7 +2032,7 @@ | |||
2032 | }, | 2032 | }, |
2033 | "string_decoder": { | 2033 | "string_decoder": { |
2034 | "version": "1.1.1", | 2034 | "version": "1.1.1", |
2035 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 2035 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
2036 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 2036 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
2037 | "dev": true, | 2037 | "dev": true, |
2038 | "requires": { | 2038 | "requires": { |
@@ -2058,7 +2058,7 @@ | |||
2058 | }, | 2058 | }, |
2059 | "strip-ansi": { | 2059 | "strip-ansi": { |
2060 | "version": "3.0.1", | 2060 | "version": "3.0.1", |
2061 | "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", | 2061 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", |
2062 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", | 2062 | "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", |
2063 | "dev": true, | 2063 | "dev": true, |
2064 | "requires": { | 2064 | "requires": { |
@@ -2073,7 +2073,7 @@ | |||
2073 | }, | 2073 | }, |
2074 | "tar": { | 2074 | "tar": { |
2075 | "version": "2.2.1", | 2075 | "version": "2.2.1", |
2076 | "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz", | 2076 | "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", |
2077 | "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", | 2077 | "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", |
2078 | "dev": true, | 2078 | "dev": true, |
2079 | "requires": { | 2079 | "requires": { |
@@ -2084,7 +2084,7 @@ | |||
2084 | }, | 2084 | }, |
2085 | "through": { | 2085 | "through": { |
2086 | "version": "2.3.8", | 2086 | "version": "2.3.8", |
2087 | "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", | 2087 | "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", |
2088 | "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", | 2088 | "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", |
2089 | "dev": true | 2089 | "dev": true |
2090 | }, | 2090 | }, |
@@ -2100,7 +2100,7 @@ | |||
2100 | "dependencies": { | 2100 | "dependencies": { |
2101 | "readable-stream": { | 2101 | "readable-stream": { |
2102 | "version": "2.3.6", | 2102 | "version": "2.3.6", |
2103 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 2103 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
2104 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 2104 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
2105 | "dev": true, | 2105 | "dev": true, |
2106 | "requires": { | 2106 | "requires": { |
@@ -2115,7 +2115,7 @@ | |||
2115 | }, | 2115 | }, |
2116 | "string_decoder": { | 2116 | "string_decoder": { |
2117 | "version": "1.1.1", | 2117 | "version": "1.1.1", |
2118 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 2118 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
2119 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 2119 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
2120 | "dev": true, | 2120 | "dev": true, |
2121 | "requires": { | 2121 | "requires": { |
@@ -2223,7 +2223,7 @@ | |||
2223 | }, | 2223 | }, |
2224 | "tunnel": { | 2224 | "tunnel": { |
2225 | "version": "0.0.4", | 2225 | "version": "0.0.4", |
2226 | "resolved": "http://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", | 2226 | "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", |
2227 | "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", | 2227 | "integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=", |
2228 | "dev": true | 2228 | "dev": true |
2229 | }, | 2229 | }, |
@@ -2254,7 +2254,7 @@ | |||
2254 | "dependencies": { | 2254 | "dependencies": { |
2255 | "underscore": { | 2255 | "underscore": { |
2256 | "version": "1.8.3", | 2256 | "version": "1.8.3", |
2257 | "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", | 2257 | "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", |
2258 | "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", | 2258 | "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", |
2259 | "dev": true | 2259 | "dev": true |
2260 | } | 2260 | } |
@@ -2397,7 +2397,7 @@ | |||
2397 | }, | 2397 | }, |
2398 | "readable-stream": { | 2398 | "readable-stream": { |
2399 | "version": "2.3.6", | 2399 | "version": "2.3.6", |
2400 | "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", | 2400 | "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", |
2401 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", | 2401 | "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", |
2402 | "dev": true, | 2402 | "dev": true, |
2403 | "requires": { | 2403 | "requires": { |
@@ -2412,7 +2412,7 @@ | |||
2412 | }, | 2412 | }, |
2413 | "string_decoder": { | 2413 | "string_decoder": { |
2414 | "version": "1.1.1", | 2414 | "version": "1.1.1", |
2415 | "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", | 2415 | "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", |
2416 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", | 2416 | "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", |
2417 | "dev": true, | 2417 | "dev": true, |
2418 | "requires": { | 2418 | "requires": { |