Skip to content

Commit

Permalink
Merge branch 'rust-lang:master' into documentation-104107
Browse files Browse the repository at this point in the history
  • Loading branch information
@ch-iv
ch-iv authored Nov 23, 2022
2 parents 06c2ce0 + d121aa3 commit 0b1ead3
Show file tree
Hide file tree
Showing 2,786 changed files with 51,930 additions and 39,804 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ a06baa56b95674fc626b3c3fd680d6a65357fe60
95e00bfed801e264e9c4ac817004153ca0f19eb6
# reformat with new rustfmt
971c549ca334b7b7406e61e958efcca9c4152822
# refactor infcx building
283abbf0e7d20176f76006825b5c52e9a4234e4c
2 changes: 1 addition & 1 deletion .mailmap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Hsiang-Cheng Yang <[email protected]>
Ian Jackson <[email protected]> <[email protected]>
Ian Jackson <[email protected]> <[email protected]>
Ian Jackson <[email protected]> <[email protected]>
Ibraheem Ahmed <[email protected]>
Ibraheem Ahmed <[email protected]> <[email protected]>
Ilyong Cho <[email protected]>
inquisitivecrystal <[email protected]>
Irina Popa <[email protected]>
Expand Down
5 changes: 0 additions & 5 deletions .reuse/dep5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ Files: *
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
License: MIT or Apache-2.0

Files: library/std/src/sync/mpsc/mpsc_queue.rs
library/std/src/sync/mpsc/spsc_queue.rs
Copyright: 2010-2011 Dmitry Vyukov
License: BSD-2-Clause

Files: src/librustdoc/html/static/fonts/FiraSans*
Copyright: 2014, Mozilla Foundation, 2014, Telefonica S.A.
License: OFL-1.1
Expand Down
Loading

0 comments on commit 0b1ead3

Please sign in to comment.