Skip to content

Commit

Permalink
Merge pull request #14 from risc0/flaub/merge-1.70.0
Browse files Browse the repository at this point in the history
Update to 1.70.0
  • Loading branch information
flaub authored Aug 27, 2023
2 parents 75edd06 + facba8d commit e47b953
Show file tree
Hide file tree
Showing 5,418 changed files with 112,700 additions and 58,432 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
max_line_length = 100

[*.md]
# double whitespace at end of line
Expand Down
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
uses: risc0/actions-rs-toolchain@v1
with:
toolchain: stable
- uses: lukka/[email protected]

- name: Check out risc0/rust
uses: actions/checkout@v3
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Session.vim
.project
.favorites.json
.settings/
.vs/

## Tool
.valgrindrc
Expand All @@ -41,7 +42,8 @@ no_llvm_build
/inst/
/llvm/
/mingw-build/
/build/
build/
!/compiler/rustc_mir_build/src/build/
/build-rust-analyzer/
/dist/
/unicode-downloads
Expand Down
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "src/rust-installer"]
path = src/tools/rust-installer
url = https://github.com/rust-lang/rust-installer.git
[submodule "src/doc/nomicon"]
path = src/doc/nomicon
url = https://github.com/rust-lang/nomicon.git
Expand Down Expand Up @@ -28,7 +25,7 @@
[submodule "src/llvm-project"]
path = src/llvm-project
url = https://github.com/rust-lang/llvm-project.git
branch = rustc/15.0-2022-12-07
branch = rustc/16.0-2023-04-05
[submodule "src/doc/embedded-book"]
path = src/doc/embedded-book
url = https://github.com/rust-embedded/book.git
Expand Down
5 changes: 4 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Alexander Ronald Altman <[email protected]>
Alexandre Martin <[email protected]>
Alexis Beingessner <[email protected]>
Alfie John <[email protected]> Alfie John <[email protected]>
Alona Enraght-Moony <[email protected]> <[email protected]>
Alona Enraght-Moony <[email protected]> <[email protected]>
Amos Onn <[email protected]>
Ana-Maria Mihalache <[email protected]>
Anatoly Ikorsky <[email protected]>
Expand Down Expand Up @@ -100,6 +102,7 @@ Carol Willing <[email protected]>
Chandler Deng <[email protected]>
Charles Lew <[email protected]> CrLF0710 <[email protected]>
Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
Chris Denton <[email protected]> Chris Denton <[email protected]>
Chris Gregory <[email protected]>
Chris Pardy <[email protected]>
Chris Pressey <[email protected]>
Expand Down Expand Up @@ -413,9 +416,9 @@ Nick Platt <[email protected]>
Niclas Schwarzlose <[email protected]>
Nicolas Abram <[email protected]>
Nicole Mazzuca <[email protected]>
Nilstrieb <[email protected]> nils <[email protected]>
Nif Ward <[email protected]>
Nika Layzell <[email protected]> <[email protected]>
Nixon Enraght-Moony <[email protected]>
NODA Kai <[email protected]>
oliver <[email protected]>
Oliver Middleton <[email protected]> <[email protected]>
Expand Down
88 changes: 82 additions & 6 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -1,23 +1,99 @@
# WARNING: this metadata is currently incomplete, do not rely on it yet.

Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files-Excluded:
src/llvm-project

Files: *
# Note that we're explicitly listing the individual files at the root of the
# repository rather than just having `Files: *`. This is explicitly done to
# help downstream forks of the Rust compiler: this way, the files they add
# won't be automatically marked as authored by the Rust project.
Files: compiler/*
library/*
tests/*
src/*
.github/*
Cargo.lock
Cargo.toml
CODE_OF_CONDUCT.md
config.example.toml
configure
CONTRIBUTING.md
COPYRIGHT
LICENSE-APACHE
LICENSE-MIT
README.md
RELEASES.md
rustfmt.toml
triagebot.toml
x
x.ps1
x.py
.editorconfig
.git-blame-ignore-revs
.gitattributes
.gitignore
.gitmodules
.mailmap
Copyright: The Rust Project Developers (see https://thanks.rust-lang.org)
License: MIT or Apache-2.0

Files: compiler/rustc_apfloat/*
Copyright: LLVM APFloat authors
The Rust Project Developers (see https://thanks.rust-lang.org)
License: NCSA AND (MIT OR Apache-2.0)

Files: compiler/rustc_codegen_cranelift/src/cranelift_native.rs
Copyright: The Cranelift Project Developers
The Rust Project Developers (see https://thanks.rust-lang.org)
License: Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR MIT)

Files: compiler/rustc_llvm/llvm-wrapper/SymbolWrapper.cpp
Copyright: LLVM authors
The Rust Project Developers (see https://thanks.rust-lang.org)
License: Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR MIT)

Files: library/core/src/unicode/unicode_data.rs
Copyright: 1991-2022 Unicode, Inc. All rights reserved.
License: Unicode-DFS-2016

Files: library/std/src/sync/mpmc/*
Copyright: 2019 The Crossbeam Project Developers
The Rust Project Developers (see https://thanks.rust-lang.org)
License: MIT OR Apache-2.0

Files: library/std/src/sys/unix/locks/fuchsia_mutex.rs
Copyright: 2016 The Fuchsia Authors
The Rust Project Developers (see https://thanks.rust-lang.org)
License: BSD-2-Clause AND (MIT OR Apache-2.0)

Files: src/test/rustdoc/auxiliary/enum-primitive.rs
Copyright: 2015 Anders Kaseorg <[email protected]>
License: MIT

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

Files: src/librustdoc/html/static/fonts/NanumBarun*
Copyright: 2010 NAVER Corporation
License: OFL-1.1

Files: src/librustdoc/html/static/fonts/SourceCodePro*
Copyright: 2010, 2012 Adobe Systems Incorporated
src/librustdoc/html/static/fonts/SourceSerif4*
Copyright: 2010, 2012, 2014-2023, Adobe Systems Incorporated
License: OFL-1.1

Files: src/librustdoc/html/static/fonts/SourceSerif4*
Copyright: 2014-2021 Adobe Systems Incorporated
License: OFL-1.1
Files: src/librustdoc/html/static/css/normalize.css
Copyright: Nicolas Gallagher and Jonathan Neal
License: MIT

Files: src/librustdoc/html/static/css/themes/ayu.css
Copyright: Ike Ku, Jessica Stokes, Leon Guan
The Rust Project Developers (see https://thanks.rust-lang.org)
License: MIT OR Apache-2.0

Files: src/doc/rustc-dev-guide/mermaid.min.js
Copyright: Knut Sveidqvist
License: MIT
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ find a mentor! You can learn more about asking questions and getting help in the
Did a compiler error message tell you to come here? If you want to create an ICE report,
refer to [this section][contributing-bug-reports] and [open an issue][issue template].

[Contributing to Rust]: https://rustc-dev-guide.rust-lang.org/contributing.html#contributing-to-rust
[rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
[std-dev-guide]: https://std-dev-guide.rust-lang.org/
[contributing-bug-reports]: https://rustc-dev-guide.rust-lang.org/contributing.html#bug-reports
Expand Down
Loading

0 comments on commit e47b953

Please sign in to comment.