Skip to content

Commit 0b1ead3

Browse files
authored
Merge branch 'rust-lang:master' into documentation-104107
2 parents 06c2ce0 + d121aa3 commit 0b1ead3

File tree

2,786 files changed

+51930
-39804
lines changed

Some content is hidden

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

2,786 files changed

+51930
-39804
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ a06baa56b95674fc626b3c3fd680d6a65357fe60
44
95e00bfed801e264e9c4ac817004153ca0f19eb6
55
# reformat with new rustfmt
66
971c549ca334b7b7406e61e958efcca9c4152822
7+
# refactor infcx building
8+
283abbf0e7d20176f76006825b5c52e9a4234e4c

.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Hsiang-Cheng Yang <[email protected]>
217217
218218
219219
220-
Ibraheem Ahmed <[email protected]>
220+
221221
Ilyong Cho <[email protected]>
222222
inquisitivecrystal <[email protected]>
223223
Irina Popa <[email protected]>

.reuse/dep5

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ Files: *
66
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
77
License: MIT or Apache-2.0
88

9-
Files: library/std/src/sync/mpsc/mpsc_queue.rs
10-
library/std/src/sync/mpsc/spsc_queue.rs
11-
Copyright: 2010-2011 Dmitry Vyukov
12-
License: BSD-2-Clause
13-
149
Files: src/librustdoc/html/static/fonts/FiraSans*
1510
Copyright: 2014, Mozilla Foundation, 2014, Telefonica S.A.
1611
License: OFL-1.1

0 commit comments

Comments
 (0)