Bug 255608 - lang/rust: Update to 1.52.0
Summary: lang/rust: Update to 1.52.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Tobias Kortkamp
URL: https://reviews.freebsd.org/D30099
Keywords:
Depends on:
Blocks:
 
Reported: 2021-05-05 05:53 UTC by Tobias Kortkamp
Modified: 2021-05-11 17:39 UTC (History)
2 users (show)

See Also:
antoine: exp-run+


Attachments
rust-1.52.0.diff (40.30 KB, patch)
2021-05-05 05:53 UTC, Tobias Kortkamp
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tobias Kortkamp freebsd_committer 2021-05-05 05:53:41 UTC
Created attachment 224679 [details]
rust-1.52.0.diff

Hello,

please do an exp-run for the Rust 1.52.0 update and some additional
changes to USES=cargo.

Thank you.
Comment 1 commit-hook freebsd_committer 2021-05-08 10:56:05 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=926bf479cc738b1860423ef23c40ae53f9ef80ee

commit 926bf479cc738b1860423ef23c40ae53f9ef80ee
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-05-08 10:12:21 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-05-08 10:40:41 +0000

    textproc/angle-grinder: Unbreak build with Rust 1.52.0 (D30099)

    error: cannot find macro `proc_macro_call` in this scope
      --> src/alias.rs:13:26
       |
    13 | const ALIASES_DIR: Dir = include_dir!("aliases");
       |                          ^^^^^^^^^^^^^^^^^^^^^^^
       |

    Update include_dir crate to the next minor version to remove the
    broken proc_macro_call-0.4.2 dependency.

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-05-07_12h05m44s/logs/errors/angle-grinder-0.16_2.log

    PR:             255608

 textproc/angle-grinder/Makefile                     | 10 +++-------
 textproc/angle-grinder/distinfo                     | 18 +++++-------------
 textproc/angle-grinder/files/patch-Cargo.toml (new) | 11 +++++++++++
 3 files changed, 19 insertions(+), 20 deletions(-)
Comment 2 commit-hook freebsd_committer 2021-05-08 10:56:06 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4c7a3f76ab2dd2b4e07c6765a3b441e0225e8c19

commit 4c7a3f76ab2dd2b4e07c6765a3b441e0225e8c19
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-05-08 08:48:00 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-05-08 10:40:39 +0000

    games/veloren: Unbreak build with Rust 1.52.0 (D30099)

    error[E0635]: unknown feature `const_checked_int_methods`
      --> common/src/lib.rs:10:5
       |
    10 |     const_checked_int_methods,
       |     ^^^^^^^^^^^^^^^^^^^^^^^^^

    http://package18.nyi.freebsd.org/data/122amd64-default-foo/2021-05-07_12h05m44s/logs/errors/veloren-0.9.0_1.log

    PR:             255608

 games/veloren/files/patch-common_src_lib.rs (new) | 10 ++++++++++
 1 file changed, 10 insertions(+)
Comment 3 Antoine Brodin freebsd_committer 2021-05-11 15:56:43 UTC
Exp-run looks fine
Comment 4 commit-hook freebsd_committer 2021-05-11 17:34:04 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d8837418ea743776bc43b9c91d83080d8eff5029

commit d8837418ea743776bc43b9c91d83080d8eff5029
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-05-04 06:05:04 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-05-11 17:29:27 +0000

    lang/rust: Update to 1.52.1

    - Add 32-bit powerpc support from bdragon@
    - Unbreak build with LibreSSL 3.3.x [1]
    - Add an update script

    Changes:        https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html
    Changes:        https://blog.rust-lang.org/2021/05/10/Rust-1.52.1.html
    PR:             255608, 255652 [1]
    Reviewed by:    mikael, pkubaj
    Exp-run by:     antoine
    Differential Revision:  https://reviews.freebsd.org/D30099

 Mk/Uses/cargo.mk                                   |   3 +-
 Mk/bsd.gecko.mk                                    |   2 +-
 lang/rust-bootstrap/Makefile                       |  12 ++-
 lang/rust-bootstrap/distinfo                       |   8 +-
 lang/rust/Makefile                                 |  39 +++++++-
 lang/rust/distinfo                                 | 108 +++++++++++----------
 lang/rust/files/patch-vendor_cc_src_lib.rs         |  10 +-
 .../files/patch-vendor_openssl-sys_build_main.rs   |   7 +-
 ...ch-compiler_rustc__target_src_spec_mod.rs (new) |  10 ++
 ...get_src_spec_powerpc__unknown__freebsd.rs (new) |  27 ++++++
 .../powerpc/patch-src_bootstrap_native.rs (new)    |  25 +++++
 ...t_llvm_lib_Driver_ToolChains_Arch_PPC.cpp (new) |  12 +++
 ..._llvm_lib_Target_PowerPC_PPCSubtarget.cpp (new) |  13 +++
 ...c_src_unix_bsd_freebsdlike_freebsd_mod.rs (new) |  12 +++
 ...c_unix_bsd_freebsdlike_freebsd_powerpc.rs (new) |  50 ++++++++++
 .../patch-vendor_openssl__src_src_lib.rs (new)     |  10 ++
 ..._rustc__ap__rustc__target_src_spec_mod.rs (new) |  10 ++
 ...get_src_spec_powerpc__unknown__freebsd.rs (new) |  27 ++++++
 ...llvm-project_clang_lib_Basic_Targets.cpp (gone) |  11 ---
 lang/rust/update.sh (new)                          |  43 ++++++++
 20 files changed, 355 insertions(+), 84 deletions(-)
Comment 5 commit-hook freebsd_committer 2021-05-11 17:34:05 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bfd338293c668a646a7a05253f8ec16c101ce517

commit bfd338293c668a646a7a05253f8ec16c101ce517
Author:     Tobias Kortkamp <tobik@FreeBSD.org>
AuthorDate: 2021-04-29 09:48:10 +0000
Commit:     Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-05-11 17:29:28 +0000

    Mk/Uses/cargo.mk: Refactor MASTER_SITES and DISTFILES construction (D30099)

    Split CARGO_CRATES into (index, crate, name, version) 4-tuples and
    use them to construct MASTER_SITES and DISTFILES.  We can also match
    crate name and versions more directly below.

    As a bonus this is slightly faster and will flag a malformed
    CARGO_CRATES earlier with a "wrong number of words" error.

    Runtime of the following command was noticeably faster

    $ <rust-ports /usr/bin/time xe -F make -C {} -V DISTFILES -V MASTER_SITES >/dev/null

    Before: 56.99 real        50.05 user         6.44 sys
    Now:    38.89 real        31.63 user         6.86 sys

    PR:             255608
    Exp-run by:     antoine

 Mk/Uses/cargo.mk | 77 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 38 deletions(-)
Comment 6 Tobias Kortkamp freebsd_committer 2021-05-11 17:39:22 UTC
Thanks.