Merge branch 'master' into stab_peek_mut

rust-lang · Apr 6, 2021 · 72796a7 · 72796a7
2 parents 7f32fda + 5c897d4
commit 72796a7
Show file tree

Hide file tree

Showing 1,525 changed files with 16,303 additions and 37,237 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -9,6 +9,7 @@
 src/etc/installer/gfx/* binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false
+config.toml.example linguist-language=TOML
 
 # Older git versions try to fix line endings on images and fonts, this prevents it.
 *.png binary

diff --git a/.mailmap b/.mailmap
@@ -286,7 +286,7 @@ Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
-Yuki Okushi <[email protected]>
+Yuki Okushi <[email protected]> <[email protected]>
 Zach Pomerantz <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>