Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports for 0.20 #1374

Merged
merged 12 commits into from Jan 24, 2024
Merged

Backports for 0.20 #1374

merged 12 commits into from Jan 24, 2024

Conversation

flaub
Copy link
Member

@flaub flaub commented Jan 24, 2024

No description provided.

dependabot bot and others added 12 commits January 23, 2024 19:32
Updates the requirements on
[which](https://github.com/harryfei/which-rs) to permit the latest
version.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/harryfei/which-rs/releases">which's
releases</a>.</em></p>
<blockquote>
<h2>6.0.0</h2>
<ul>
<li>MSRV is now 1.70</li>
<li>Upgraded all dependencies to latest version</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/harryfei/which-rs/blob/master/CHANGELOG.md">which's
changelog</a>.</em></p>
<blockquote>
<h2>6.0.0</h2>
<ul>
<li>MSRV is now 1.70</li>
<li>Upgraded all dependencies to latest version</li>
</ul>
<h2>5.0.0</h2>
<ul>
<li>Remove several unused error messages</li>
<li>Windows executables can now be found even if they don't have a
'.exe' extension.</li>
<li>Add new error message,
<code>Error::CannotGetCurrentDirAndPathListEmpty</code></li>
</ul>
<h2>4.4.2</h2>
<ul>
<li>Remove dependency on <code>dirs</code> crate due to MPL licensing in
its tree. Use <code>home</code> crate instead. (<a
href="https://github.com/Xaeroxe"><code>@​Xaeroxe</code></a>)</li>
</ul>
<h2>4.4.1</h2>
<ul>
<li>Add tilde expansion for home directory (<a
href="https://github.com/Xaeroxe"><code>@​Xaeroxe</code></a>)</li>
<li>Swap out libc for rustix, forbid unsafe (<a
href="https://github.com/notgull"><code>@​notgull</code></a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/harryfei/which-rs/commit/fcde0ea802364deb2a6ec6e33879c903b4416242"><code>fcde0ea</code></a>
Upgrade deps, move to 6.0.0</li>
<li><a
href="https://github.com/harryfei/which-rs/commit/f50675ac1d5363b1a35a095999ad7aa618c59594"><code>f50675a</code></a>
Prep 5.0.0 release</li>
<li><a
href="https://github.com/harryfei/which-rs/commit/e776ff05bc7c36b5393441a73f104145602dff85"><code>e776ff0</code></a>
Return appropriate error if path list defined and empty</li>
<li><a
href="https://github.com/harryfei/which-rs/commit/70d2d1c9704802546eb285217c6def3c9cc94d17"><code>70d2d1c</code></a>
Null terminate string for windows api</li>
<li><a
href="https://github.com/harryfei/which-rs/commit/5c6208b69e01243e937607ff40288a496478f2c2"><code>5c6208b</code></a>
Change how unit test gets current exe</li>
<li><a
href="https://github.com/harryfei/which-rs/commit/6a027d16bd5a53921cd1937901dc76c3242e62cd"><code>6a027d1</code></a>
Add unit test for extensionless Windows executable</li>
<li>See full diff in <a
href="https://github.com/harryfei/which-rs/compare/5.0.0...6.0.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix some typos in comments

Co-authored-by: Frank Laub <flaub@risc0.com>
This PR refactors the `IRiscZeroVerifier` smart contract interface to:

* Match the latest changes to the Rust verifier API, including updates
to the `ReceiptClaim` to support composition.
* Incorporate feedback from outside smart contract review.

---------

Co-authored-by: Frank Laub <flaub@risc0.com>
Co-authored-by: capossele <angelocapossele@gmail.com>
Proof of fault is a mechanism that allows receipt generation for
programs that fail due to incorrect RISC-V execution and other
conditions. We're removing this feature for the time being and plan to
implement this in a future circuit revision.

This change removes the fault checker guest code, the `fault-proof`
feature flag, the `bootstrap-fault` command from `cargo xtask`, and
removes `ExitCode::Fault` and marks this as reserved in base.proto.

Fixes: #1307
If one uses a git path for dependencies of risc0 in Cargo.toml, chances
are that the compiler would complain:

```
warning: skipping duplicate package `xgboost` found at `/Users/cusgadmin/.cargo/git/checkouts/risc0-b4649977e2e81438/341a014/examples/xgboost/methods/guest`
```

This is due to xgboost's example repo has the name `xgboost` and its
methods/guest also has the name `xgboost`. Since this is a very boring
warning but appears to show up frequently, it makes sense to suppress
it, by just naming the xgboost example repo differently.
Fix clippy action so it fails properly and lists errors that need to be
fixed.

---------

Co-authored-by: BatAdmin <batadmin@BatBook-Pro.local>
Co-authored-by: Victor Graf <victor@risczero.com>
Co-authored-by: Frank Laub <frank@risczero.com>
* Avoid re-downloading if cached copy is already valid
* Copy source from LFS only if file is valid (i.e. LFS has been pulled)
* Download from S3 bucket otherwise
* Update hash to latest
* Fix docs.rs build issue
* Fixes #1366
* Fixes #1048
* Supersedes #1347
* Supersedes #1348
* Fixes #1163

Co-authored-by: @weikengchen
Updates the requirements on
[env_logger](https://github.com/rust-cli/env_logger) to permit the
latest version.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md">env_logger's
changelog</a>.</em></p>
<blockquote>
<h2>[0.11.0] - 2024-01-19</h2>
<h3>Breaking Change</h3>
<ul>
<li>Removed bespoke styling API
<ul>
<li><code>env_logger::fmt::Formatter::style</code></li>
<li><code>env_logger::fmt::Formatter::default_styled_level</code></li>
<li><code>env_logger::fmt::Style</code></li>
<li><code>env_logger::fmt::Color</code></li>
<li><code>env_logger::fmt::StyledValue</code></li>
</ul>
</li>
<li>Removed <code>env_logger::filter</code> in favor of
<code>env_filter</code></li>
</ul>
<h3>Compatibility</h3>
<p>MSRV changed to 1.71</p>
<h3>Features</h3>
<ul>
<li>Automatically adapt ANSI escape codes in logged messages to the
current terminal's capabilities</li>
<li>Add support for <code>NO_COLOR</code> and
<code>CLICOLOR_FORCE</code>, see <a
href="https://bixense.com/clicolors/">https://bixense.com/clicolors/</a></li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Print colors when <code>is_test(true)</code></li>
<li>Allow styling with <code>Target::Pipe</code></li>
</ul>
<h2>[0.10.2] - 2024-01-18</h2>
<h3>Performance</h3>
<ul>
<li>Avoid extra UTF-8 validation performed in some cases</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Ensure custom pipes/stdout get flushed</li>
<li>Don't panic on broken pipes when <code>color</code> is disabled</li>
</ul>
<h2>[0.10.1] - 2023-11-10</h2>
<h3>Performance</h3>
<ul>
<li>Avoid hashing directives and accessing RNG on startup</li>
</ul>
<h3>Documentation</h3>
<ul>
<li>Tweak <code>RUST_LOG</code> documentation</li>
</ul>
<h2>[0.10.0] - 2022-11-24</h2>
<p>MSRV changed to 1.60 to hide optional dependencies</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rust-cli/env_logger/commit/8f4361ba4439acb69068be0e181d2d1300b7218d"><code>8f4361b</code></a>
chore: Release</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/ba41ebb6d2d726403560cd987b1c5b3c6797f817"><code>ba41ebb</code></a>
docs: Update changelog</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/5e226cb2b73d6c9f1b21886a4b504afdea1ebfcf"><code>5e226cb</code></a>
chore: Release</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/23441be565bcc4c65604a5e04d3990967e596ff4"><code>23441be</code></a>
Merge pull request <a
href="https://redirect.github.com/rust-cli/env_logger/issues/300">#300</a>
from epage/other</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/6c2ea8028236fe80c1da0a354b19808bf440858d"><code>6c2ea80</code></a>
style(filter): Clean up</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/2d3526001061bacbf4a4c47767a318986c2c61b0"><code>2d35260</code></a>
feat(filter): Add a Logger decorator</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/e6e2b633688a56a53ad718b3b498243cb3893d52"><code>e6e2b63</code></a>
fix(log)!: Dont re-export env_filter</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/841eba41feb44317facc586745b28707590d11fd"><code>841eba4</code></a>
refactor(filter): Pull out filter mod</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/98c450f85b95779b60be37d847e176856305b6fd"><code>98c450f</code></a>
refactor(filter): Pull out directive mod</li>
<li><a
href="https://github.com/rust-cli/env_logger/commit/c769e03f40e03e83b972c334195014eddf8b2c9a"><code>c769e03</code></a>
refactor(filter): Flatten the mod</li>
<li>Additional commits viewable in <a
href="https://github.com/rust-cli/env_logger/compare/v0.10.0...v0.11.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@flaub flaub added this to the 0.20.0 milestone Jan 24, 2024
@flaub flaub self-assigned this Jan 24, 2024
Copy link

vercel bot commented Jan 24, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
website ✅ Ready (Inspect) Visit Preview Jan 24, 2024 3:45am

@flaub flaub merged commit 4c7df32 into release-0.20 Jan 24, 2024
27 checks passed
@flaub flaub deleted the flaub/backports branch January 24, 2024 04:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants