Paolo Bonzini <pbonz...@redhat.com> writes:

> Apply a patch that removes "let ... else" constructs, replacing them with
> "if let ... else" or "let ... = match ...".  "let ... else" was stabilized in
> Rust 1.65.0.
>
> Reviewed-by: Zhao Liu <zhao1....@intel.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>

Reviewed-by: Junjie Mao <junjie....@hotmail.com>

One question and one note below.

> ---
>  .gitattributes                                |  2 +
>  subprojects/bilge-impl-0.2-rs.wrap            |  1 +
>  subprojects/packagefiles/.gitattributes       |  1 +
>  .../packagefiles/bilge-impl-1.63.0.patch      | 45 +++++++++++++++++++
>  4 files changed, 49 insertions(+)
>  create mode 100644 subprojects/packagefiles/.gitattributes
>  create mode 100644 subprojects/packagefiles/bilge-impl-1.63.0.patch
>
> diff --git a/.gitattributes b/.gitattributes
> index 6dc6383d3d1..9ce7a19581a 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -5,3 +5,5 @@
>  *.rs            diff=rust
>  *.rs.inc        diff=rust
>  Cargo.lock      diff=toml merge=binary
> +
> +*.patch         -text -whitespace
<snip>
> diff --git a/subprojects/packagefiles/.gitattributes 
> b/subprojects/packagefiles/.gitattributes
> new file mode 100644
> index 00000000000..bf5b766d75d
> --- /dev/null
> +++ b/subprojects/packagefiles/.gitattributes
> @@ -0,0 +1 @@
> +/*.patch     -text

Do we really need unsetting the attrs for *.patch in both .gitattributes
and subprojects/packagefiles/.gitattributes? Is that related to the
different setting of -whitespace?

> diff --git a/subprojects/packagefiles/bilge-impl-1.63.0.patch 
> b/subprojects/packagefiles/bilge-impl-1.63.0.patch
> new file mode 100644
> index 00000000000..987428a6d65
> --- /dev/null
> +++ b/subprojects/packagefiles/bilge-impl-1.63.0.patch
> @@ -0,0 +1,45 @@
> +--- a/src/shared/discriminant_assigner.rs
> ++++ b/src/shared/discriminant_assigner.rs

Just a note: when fetching this series using b4 am, I still get this
patch with LF line ending. Later when merging one may need to fetch this
specific commit directly from the git repository.

--
Best Regards
Junjie Mao

Reply via email to