Skip to content

Commit c1f35e4

Browse files
apogeeoakapogeeoak
committed
Merge branch 'main' into text
2 parents f78c480 + cd2b5e8 commit c1f35e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1380
-351
lines changed

‎.all-contributorsrc

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -847,6 +847,251 @@
847847
"contributions": [
848848
"content"
849849
]
850+
},
851+
{
852+
"login": "PiDelport",
853+
"name": "Pi Delport",
854+
"avatar_url": "https://avatars.githubusercontent.com/u/630271?v=4",
855+
"profile": "https://about.me/pjdelport",
856+
"contributions": [
857+
"content"
858+
]
859+
},
860+
{
861+
"login": "sateeshkumarb",
862+
"name": "Sateesh ",
863+
"avatar_url": "https://avatars.githubusercontent.com/u/429263?v=4",
864+
"profile": "https://github.com/sateeshkumarb",
865+
"contributions": [
866+
"code",
867+
"content"
868+
]
869+
},
870+
{
871+
"login": "kayuapi",
872+
"name": "ZC",
873+
"avatar_url": "https://avatars.githubusercontent.com/u/10304328?v=4",
874+
"profile": "https://github.com/kayuapi",
875+
"contributions": [
876+
"content"
877+
]
878+
},
879+
{
880+
"login": "hyperparabolic",
881+
"name": "hyperparabolic",
882+
"avatar_url": "https://avatars.githubusercontent.com/u/12348474?v=4",
883+
"profile": "https://github.com/hyperparabolic",
884+
"contributions": [
885+
"code"
886+
]
887+
},
888+
{
889+
"login": "kolbma",
890+
"name": "arlecchino",
891+
"avatar_url": "https://avatars.githubusercontent.com/u/5228369?v=4",
892+
"profile": "https://www.net4visions.at",
893+
"contributions": [
894+
"doc"
895+
]
896+
},
897+
{
898+
"login": "jazzplato",
899+
"name": "Richthofen",
900+
"avatar_url": "https://avatars.githubusercontent.com/u/7576730?v=4",
901+
"profile": "https://richthofen.io/",
902+
"contributions": [
903+
"code"
904+
]
905+
},
906+
{
907+
"login": "cseltol",
908+
"name": "Ivan Nerazumov",
909+
"avatar_url": "https://avatars.githubusercontent.com/u/64264529?v=4",
910+
"profile": "https://github.com/cseltol",
911+
"contributions": [
912+
"doc"
913+
]
914+
},
915+
{
916+
"login": "lauralindzey",
917+
"name": "lauralindzey",
918+
"avatar_url": "https://avatars.githubusercontent.com/u/65185744?v=4",
919+
"profile": "https://github.com/lauralindzey",
920+
"contributions": [
921+
"doc"
922+
]
923+
},
924+
{
925+
"login": "sinharaksh1t",
926+
"name": "Rakshit Sinha",
927+
"avatar_url": "https://avatars.githubusercontent.com/u/28585848?v=4",
928+
"profile": "https://github.com/sinharaksh1t",
929+
"contributions": [
930+
"content"
931+
]
932+
},
933+
{
934+
"login": "dbednar230",
935+
"name": "Damian",
936+
"avatar_url": "https://avatars.githubusercontent.com/u/54457902?v=4",
937+
"profile": "https://github.com/dbednar230",
938+
"contributions": [
939+
"content"
940+
]
941+
},
942+
{
943+
"login": "benarmstead",
944+
"name": "Ben Armstead",
945+
"avatar_url": "https://avatars.githubusercontent.com/u/70973680?v=4",
946+
"profile": "https://benarmstead.co.uk",
947+
"contributions": [
948+
"code"
949+
]
950+
},
951+
{
952+
"login": "anuk909",
953+
"name": "anuk909",
954+
"avatar_url": "https://avatars.githubusercontent.com/u/34924662?v=4",
955+
"profile": "https://github.com/anuk909",
956+
"contributions": [
957+
"content",
958+
"code"
959+
]
960+
},
961+
{
962+
"login": "granddaifuku",
963+
"name": "granddaifuku",
964+
"avatar_url": "https://avatars.githubusercontent.com/u/49578068?v=4",
965+
"profile": "https://granddaifuku.com/",
966+
"contributions": [
967+
"content"
968+
]
969+
},
970+
{
971+
"login": "Weilet",
972+
"name": "Weilet",
973+
"avatar_url": "https://avatars.githubusercontent.com/u/32561597?v=4",
974+
"profile": "https://weilet.me",
975+
"contributions": [
976+
"content"
977+
]
978+
},
979+
{
980+
"login": "Millione",
981+
"name": "LIU JIE",
982+
"avatar_url": "https://avatars.githubusercontent.com/u/38575932?v=4",
983+
"profile": "https://github.com/Millione",
984+
"contributions": [
985+
"content"
986+
]
987+
},
988+
{
989+
"login": "abusch",
990+
"name": "Antoine Büsch",
991+
"avatar_url": "https://avatars.githubusercontent.com/u/506344?v=4",
992+
"profile": "https://github.com/abusch",
993+
"contributions": [
994+
"code"
995+
]
996+
},
997+
{
998+
"login": "frogtd",
999+
"name": "frogtd",
1000+
"avatar_url": "https://avatars.githubusercontent.com/u/31412003?v=4",
1001+
"profile": "https://frogtd.com/",
1002+
"contributions": [
1003+
"content"
1004+
]
1005+
},
1006+
{
1007+
"login": "EmisonLu",
1008+
"name": "Zhenghao Lu",
1009+
"avatar_url": "https://avatars.githubusercontent.com/u/54395432?v=4",
1010+
"profile": "https://github.com/EmisonLu",
1011+
"contributions": [
1012+
"content"
1013+
]
1014+
},
1015+
{
1016+
"login": "fredr",
1017+
"name": "Fredrik Enestad",
1018+
"avatar_url": "https://avatars.githubusercontent.com/u/762956?v=4",
1019+
"profile": "https://soundtrackyourbrand.com",
1020+
"contributions": [
1021+
"content"
1022+
]
1023+
},
1024+
{
1025+
"login": "xuesongbj",
1026+
"name": "xuesong",
1027+
"avatar_url": "https://avatars.githubusercontent.com/u/18476085?v=4",
1028+
"profile": "http://xuesong.pydevops.com",
1029+
"contributions": [
1030+
"content"
1031+
]
1032+
},
1033+
{
1034+
"login": "MpdWalsh",
1035+
"name": "Michael Walsh",
1036+
"avatar_url": "https://avatars.githubusercontent.com/u/48160144?v=4",
1037+
"profile": "https://github.com/MpdWalsh",
1038+
"contributions": [
1039+
"code"
1040+
]
1041+
},
1042+
{
1043+
"login": "alirezaghey",
1044+
"name": "alirezaghey",
1045+
"avatar_url": "https://avatars.githubusercontent.com/u/26653424?v=4",
1046+
"profile": "https://github.com/alirezaghey",
1047+
"contributions": [
1048+
"content"
1049+
]
1050+
},
1051+
{
1052+
"login": "frvannes16",
1053+
"name": "Franklin van Nes",
1054+
"avatar_url": "https://avatars.githubusercontent.com/u/3188475?v=4",
1055+
"profile": "https://github.com/frvannes16",
1056+
"contributions": [
1057+
"code"
1058+
]
1059+
},
1060+
{
1061+
"login": "nekonako",
1062+
"name": "nekonako",
1063+
"avatar_url": "https://avatars.githubusercontent.com/u/46141275?v=4",
1064+
"profile": "https://nekonako.github.io",
1065+
"contributions": [
1066+
"code"
1067+
]
1068+
},
1069+
{
1070+
"login": "tan-zx",
1071+
"name": "ZX",
1072+
"avatar_url": "https://avatars.githubusercontent.com/u/67887489?v=4",
1073+
"profile": "https://github.com/tan-zx",
1074+
"contributions": [
1075+
"content"
1076+
]
1077+
},
1078+
{
1079+
"login": "sundevilyang",
1080+
"name": "Yang Wen",
1081+
"avatar_url": "https://avatars.githubusercontent.com/u/1499214?v=4",
1082+
"profile": "https://github.com/sundevilyang",
1083+
"contributions": [
1084+
"content"
1085+
]
1086+
},
1087+
{
1088+
"login": "highb",
1089+
"name": "Brandon High",
1090+
"avatar_url": "https://avatars.githubusercontent.com/u/759848?v=4",
1091+
"profile": "https://brandon-high.com",
1092+
"contributions": [
1093+
"doc"
1094+
]
8501095
}
8511096
],
8521097
"contributorsPerLine": 8,

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ exercises/clippy/Cargo.toml
77
exercises/clippy/Cargo.lock
88
.idea
99
.vscode
10+
*.iml

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
<a name="4.6.0"></a>
2+
## 4.6.0 (2021-09-25)
3+
4+
5+
#### Features
6+
7+
* add advanced_errs2 ([abd6b70c](https://github.com/rust-lang/rustlings/commit/abd6b70c72dc6426752ff41f09160b839e5c449e))
8+
* add advanced_errs1 ([882d535b](https://github.com/rust-lang/rustlings/commit/882d535ba8628d5e0b37e8664b3e2f26260b2671))
9+
* Add a farewell message when quitting `watch` ([1caef0b4](https://github.com/rust-lang/rustlings/commit/1caef0b43494c8b8cdd6c9260147e70d510f1aca))
10+
* add more watch commands ([a7dc080b](https://github.com/rust-lang/rustlings/commit/a7dc080b95e49146fbaafe6922a6de2f8cb1582a), closes [#842](https://github.com/rust-lang/rustlings/issues/842))
11+
* **modules:** update exercises, add modules3 (#822) ([dfd2fab4](https://github.com/rust-lang/rustlings/commit/dfd2fab4f33d1bf59e2e5ee03123c0c9a67a9481))
12+
* **quiz1:** add default function name in comment (#838) ([0a11bad7](https://github.com/rust-lang/rustlings/commit/0a11bad71402b5403143d642f439f57931278c07))
13+
14+
#### Bug Fixes
15+
16+
* Correct small typo in exercises/conversions/from_str.rs ([86cc8529](https://github.com/rust-lang/rustlings/commit/86cc85295ae36948963ae52882e285d7e3e29323))
17+
* **cli:** typo in exercise.rs (#848) ([06d5c097](https://github.com/rust-lang/rustlings/commit/06d5c0973a3dffa3c6c6f70acb775d4c6630323c))
18+
* **from_str, try_from_into:** custom error types ([2dc93cad](https://github.com/rust-lang/rustlings/commit/2dc93caddad43821743e4903d89b355df58d7a49))
19+
* **modules2:** fix typo (#835) ([1c3beb0a](https://github.com/rust-lang/rustlings/commit/1c3beb0a59178c950dc05fe8ee2346b017429ae0))
20+
* **move_semantics5:**
21+
* change &mut *y to &mut x (#814) ([d75759e8](https://github.com/rust-lang/rustlings/commit/d75759e829fdcd64ef071cf4b6eae2a011a7718b))
22+
* Clarify instructions ([df25684c](https://github.com/rust-lang/rustlings/commit/df25684cb79f8413915e00b5efef29369849cef1))
23+
* **quiz1:** Fix inconsistent wording (#826) ([03131a3d](https://github.com/rust-lang/rustlings/commit/03131a3d35d9842598150f9da817f7cc26e2669a))
24+
25+
26+
27+
<a name="4.5.0"></a>
28+
## 4.5.0 (2021-07-07)
29+
30+
31+
#### Features
32+
33+
* Add move_semantics5 exercise. (#746) ([399ab328](https://github.com/rust-lang/rustlings/commit/399ab328d8d407265c09563aa4ef4534b2503ff2))
34+
* **cli:** Add "next" to run the next unsolved exercise. (#785) ([d20e413a](https://github.com/rust-lang/rustlings/commit/d20e413a68772cd493561f2651cf244e822b7ca5))
35+
36+
#### Bug Fixes
37+
38+
* rename result1 to errors4 ([50ab289d](https://github.com/rust-lang/rustlings/commit/50ab289da6b9eb19a7486c341b00048c516b88c0))
39+
* move_semantics5 hints ([1b858285](https://github.com/rust-lang/rustlings/commit/1b85828548f46f58b622b5e0c00f8c989f928807))
40+
* remove trailing whitespaces from iterators1 ([4d4fa774](https://github.com/rust-lang/rustlings/commit/4d4fa77459392acd3581c6068aa8be9a02de12fc))
41+
* add hints to generics1 and generics2 exercises ([31457940](https://github.com/rust-lang/rustlings/commit/31457940846b3844d78d4a4d2b074bc8d6aaf1eb))
42+
* remove trailing whitespace ([d9b69bd1](https://github.com/rust-lang/rustlings/commit/d9b69bd1a0a7a99f2c0d80933ad2eea44c8c71b2))
43+
* **installation:** first PowerShell command ([aa9a943d](https://github.com/rust-lang/rustlings/commit/aa9a943ddf3ae260782e73c26bcc9db60e5894b6))
44+
* **iterators5:** derive Clone, Copy ([91fc9e31](https://github.com/rust-lang/rustlings/commit/91fc9e3118f4af603c9911698cc2a234725cb032))
45+
* **quiz1:** Updated question description (#794) ([d8766496](https://github.com/rust-lang/rustlings/commit/d876649616cc8a8dd5f539f8bc1a5434b960b1e9))
46+
* **try_from_into, from_str:** hints for dyn Error ([11d2cf0d](https://github.com/rust-lang/rustlings/commit/11d2cf0d604dee3f5023c17802d69438e69fa50e))
47+
* **variables5:** confine the answer further ([48ffcbd2](https://github.com/rust-lang/rustlings/commit/48ffcbd2c4cc4d936c2c7480019190f179813cc5))
48+
49+
50+
151
<a name="4.4.0"></a>
252
## 4.4.0 (2021-04-24)
353

0 commit comments

Comments
 (0)