Commit Graph

544 Commits

Author SHA1 Message Date
Zheng Ping
ae0aedbb12 Update ch17-02-trait-objects.md 2017-05-26 22:52:14 +08:00
Zheng Ping
75227c98be Update ch17-02-trait-objects.md 2017-05-26 18:02:17 +08:00
Zheng Ping
b06712ebf2 Update ch17-02-trait-objects.md 2017-05-25 17:39:54 +08:00
KaiserY
6e69e07413 Merge pull request #48 from murphil/murphy
Murphy
2017-05-24 08:01:49 -05:00
murphy
dc41ac50df 2017-05-24 01:04:42 +08:00
murphy
2e52c5aba5 2017-05-24 01:00:39 +08:00
murphy
8457b27357 2017-05-24 00:45:24 +08:00
murphy
9c38ba4934 -> 浮点型 2017-05-24 00:41:08 +08:00
KaiserY
468179cad2 Merge pull request #47 from murphil/murphy
小修改
2017-05-22 09:03:12 -05:00
murphy
f82e6b56a3 小修改 2017-05-22 09:55:44 +00:00
KaiserY
6a77e161c2 Merge pull request #46 from murphil/murphy
Murphy
2017-05-21 19:14:44 -05:00
murphy
0048678199 Merge branch 'murphy' of github.com:murphil/trpl-zh-cn into murphy 2017-05-21 22:35:24 +08:00
murphy
27712529bb ch03-01 2017-05-21 22:35:04 +08:00
KaiserY
f2f4aacd17 Merge pull request #45 from murphil/murphy
Murphy
2017-05-21 05:23:17 -05:00
Murphy
554d726363 Merge branch 'master' into murphy 2017-05-20 18:19:29 +08:00
murphy
d42d8abc4b 第二章校对完成 2017-05-20 18:15:37 +08:00
KaiserY
86b0ac1f7d Merge pull request #44 from SilverRainZ/master
Some typos fixed
2017-05-18 09:26:14 -05:00
Shengyu Zhang
ff41736555 fixed typo at CH04-02 L191: extra comma 2017-05-18 20:01:29 +08:00
Shengyu Zhang
50eb45fb9c fixed bold format at CH04-01 L112 2017-05-18 20:01:16 +08:00
Shengyu Zhang
76b3fe5327 fixed typo at CH03-02 L153: 这写 -> 这些 2017-05-18 19:55:55 +08:00
murphy
46dd5af871 modified: src/ch02-00-guessing-game-tutorial.md 2017-05-18 00:04:30 +08:00
KaiserY
1c310d118a Merge pull request #42 from murphil/murphy
376 	modified:   src/ch02-00-guessing-game-tutorial.md
2017-05-16 19:25:20 -05:00
murphy
0cae40e09a 376 modified: src/ch02-00-guessing-game-tutorial.md 2017-05-17 00:38:21 +08:00
KaiserY
c6db0e3d95 Merge pull request #41 from murphil/murphy
Murphy
2017-05-16 09:22:30 -05:00
murphy
8e76278eb5 -> 使用 println! 占位符打印值 2017-05-16 21:32:19 +08:00
murphy
c510bd8bcc modified: src/ch01-02-hello-world.md
modified:   src/ch02-00-guessing-game-tutorial.md
2017-05-16 20:13:38 +08:00
murphy
b5c98492f1 modified: src/ch01-02-hello-world.md 2017-05-16 00:24:30 +08:00
KaiserY
6be944dce0 Merge pull request #40 from murphil/murphy
Murphy
2017-05-15 09:33:41 -05:00
murphy
6081f64d20 第一章校订完成 2017-05-15 21:55:24 +08:00
murphy
1f2533ae4d 修改: src/ch01-02-hello-world.md
修改:     src/ch16-04-extensible-concurrency-sync-and-send.md
2017-05-15 15:43:36 +00:00
KaiserY
d85f50484f wip: update ch17-02 2017-05-15 08:27:11 +08:00
KaiserY
a8715f3702 Merge pull request #38 from murphil/murphy
修正笔误和表述
2017-05-14 19:22:45 -05:00
murphy
e4aaa1e839 src/ch16-04-extensible-concurrency-sync-and-send.md 2017-05-13 09:31:54 +00:00
murphy
558e8af136 typo 2017-05-12 22:58:23 +08:00
murphy
99cc253553 modified: src/ch17-02-trait-objects.md 2017-05-12 22:52:45 +08:00
murphy
acc1ac38fe 接受 -> 使用 2017-05-12 00:27:16 +08:00
murphy
b0a5c825ab 那么如果 2017-05-12 00:16:31 +08:00
murphy
201565cf20 修正笔误和表述
modified:   src/ch04-01-what-is-ownership.md
	modified:   src/ch15-01-box.md
	modified:   src/ch16-03-shared-state.md
	modified:   src/ch17-01-what-is-oo.md
	modified:   src/ch17-02-trait-objects.md
2017-05-11 23:51:16 +08:00
KaiserY
c2541a0f3c Merge pull request #37 from murphil/murphy
修订:使用Sync和Send trait 的可扩展并发
2017-05-11 09:54:19 -05:00
KaiserY
00a0f285f3 Merge pull request #36 from murphil/master
修改HashMap章的一些表述
2017-05-11 09:54:08 -05:00
murphy
06b387e26d 修订:使用Sync和Send trait 的可扩展并发 2017-05-11 14:24:02 +00:00
Murphy
f6ef38716e Merge branch 'master' into master 2017-05-11 13:55:21 +08:00
murphy
877583ea3c repo 2017-05-11 13:45:34 +00:00
murphy
f92f141762 修改HashMap章的一些表述 2017-05-11 12:08:18 +00:00
KaiserY
0a610bf527 Merge pull request #35 from murphil/fixSomeTypo
typo
2017-05-10 19:31:11 -05:00
murphy
98c06b86db typo 2017-05-11 00:20:08 +08:00
KaiserY
a5fc515612 Merge pull request #34 from murphil/fixSomeTypo
修正一些错别字和模糊的表述
2017-05-10 10:35:44 -05:00
murphy
05e973333f 修正一些错别字和模糊的表述 2017-05-10 23:16:47 +08:00
KaiserY
a92d0401a8 Merge pull request #33 from KazamaSion/patch-1
Fix the mistake about Rust macros mentioned in 1.2
2017-05-08 20:01:36 -05:00
Kazama Sion
b8355ff656 Fix the mistake about Rust macros mentioned
The original text is: "We'll discuss Rust macros in more detail in Appendix E". And the Appendix is in section 21.
2017-05-09 03:32:51 +08:00