From patchwork Wed Jan 12 15:27:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 36273 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6FE5A27BBEA; Wed, 12 Jan 2022 15:52:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 99ACD27BBE9 for ; Wed, 12 Jan 2022 15:52:14 +0000 (GMT) Received: from localhost ([::1]:49730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7fv2-0002Kh-Ny for patchwork@mira.cbaines.net; Wed, 12 Jan 2022 10:52:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7fYs-0000uU-Gb for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:18 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7fYs-0002bf-2R for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:18 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7fYq-0002M6-Vx for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:16 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53208] [PATCH 38/39] gnu: rust-analyzer: Update to 2022-01-10. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Jan 2022 15:29:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53208@debbugs.gnu.org Received: via spool by 53208-submit@debbugs.gnu.org id=B53208.16420013498906 (code B ref 53208); Wed, 12 Jan 2022 15:29:16 +0000 Received: (at 53208) by debbugs.gnu.org; 12 Jan 2022 15:29:09 +0000 Received: from localhost ([127.0.0.1]:58672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7fYd-0002Hl-DA for submit@debbugs.gnu.org; Wed, 12 Jan 2022 10:29:09 -0500 Received: from out203-205-251-85.mail.qq.com ([203.205.251.85]:59299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1n7fY4-0002Bm-GJ for 53208@debbugs.gnu.org; Wed, 12 Jan 2022 10:28:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1642001302; bh=LL5XE3maRbNOffu6q74DfQHIlT6JYI0zxLv4xxbg7rc=; h=From:To:Subject:Date:In-Reply-To:References; b=FYOiHl+btMXm85HQgq8xAHKPWAOlMLP8RlNg483WfHUdmfEsKHssf5EW+8jRkPc85 n3V0H4ZF7kffIpTaqS6162m3PDTAk0OKLI7lxs6TrKO0NNx7lZcthnBI11hFjqu80l imvuE0OBbYYJruGNO3sg3hbmJnZHHrEBz1QvV75Q= Received: from localhost.localdomain ([112.10.216.34]) by newxmesmtplogicsvrsza5.qq.com (NewEsmtp) with SMTP id 6FB19A7A; Wed, 12 Jan 2022 23:27:59 +0800 X-QQ-mid: xmsmtpt1642001301t95v42sxg Message-ID: X-QQ-XMAILINFO: NRRnJ4gYtGQQ96e5NugD7SHPGgwgIbNooY5n4x+uqSvI282xoo1UTI5XxtUygV kCL+ZX6XrSt4LNCp7sE/l0HMcDll9c/TTzUnpZmmC+hYsfJaYxFG2ZiKBtEL0J9mZosgLunslAX/ oq4fyt86VTxcDB0QoKVtXl7/S529PKT1HqKUIxVpmHmaz9xTS8Or6JC/7cZjfVoc7wuPHcC0pfw1 eRaj7gW3svS2I7aqD/C6g53nXuPRU4XycZDpHvUiIudlV0AYm2veAyZL2greGnL/OLI3qCa/OdOB GmH2APCvRi75FbSa+ImTNcVh7LMVhPOTfXge4ecWa4//NUGMh0l3b453oFZ5qOjQcMgoiFns8lWA xaWEQv2dDa6Z2t32peEH36i60z0RSkNwhf6+9VYegusK8aXHdgnH1kF0BbqqJ+8wZ/6tcM0ehbjq qpIEQ2bA6xEKLwgnu1YDJ3O3eF25bweoGeuGGrjsCX73ijWjamI+EUPdgFsvIaqw8PyDEHxBVbnt yJIl6Toh4s4UNVmJATiE4PP/44KpFiG/MOYzIkboegcgAniREfFLAqwPEnEy6KwyW1MGO2bE40mE wabz3XTpARZEHzHwfzKq8SN+DXVzoYxg6kQYm9DPdS2ZYmoI1TyxpMXd5mD2toLBNe4Fx381H2UN K67JX/efN/gBfRVeZeWzmara2NLtFs8dfr85Ji52dBbjfoDoP5aMgL+gbHa+urZ7nW9KewF4KKl9 J/AEnDsp1e5BTEnkPNCiqFDNFyxt/u6KX40ZrdTFI3SonEy3w1CCfUQwJ9fad9kgjGf5LEYkPdQV LaRz+dcyhAmA+WUyo3sVhEOyKOIA8r/2yT2WXAcKEd9QFHFd+3KOSfYRPKxTFwCSj6DXL6LbNBuQ == X-QQ-SPAM: true Date: Wed, 12 Jan 2022 23:27:58 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust-apps.scm (rust-analyzer): Update to 2022-01-10. [arguments]: Add #:rust rust-1.57. <#:cargo-test-flags>: Skip two fail test. <#:cargo-inputs>: Add rust-typed-arena-2. Remove rust-tracing-tree-0.1 Use rust-cargo-metadata-0.14 replace rust-cargo-metadata-0.13, use rust-chalk-ir-0.75 replace rust-chalk-ir-0.68, use rust-chalk-recursive-0.75 replace rust-chalk-recursive-0.68, use rust-countme-3 replace rust-countme-2, use rust-cov-mark-2 replace rust-cov-mark-1, use rust-lsp-types-0.91 replace rust-lsp-types-0.89, use rust-memmap2-0.5 replace rust-memmap2-0.2, use rust-miow-0.4 replace rust-miow-0.3, use rust-object-0.28 replace rust-object-0.24, use rust-pulldown-cmark-to-cmark-7 replace rust-pulldown-cmark-to-cmark-6, use rust-rowan-0.15 replace rust-rowan-0.13, use rust-rustc-ap-rustc-lexer-725 replace rust-rustc-ap-rustc-lexer-721. Move rust-quote-1 to #:cargo-development-inputs, Move rust-expect-test-1 to #:cargo-development-inputs, move rust-rayon-1 to #:cargo-development-inputs, move rust-tracing-0.1 to #:cargo-development-inputs, move rust-ungrammar-1 to #:cargo-development-inputs. <#:cargo-development-inputs>: Add rust-arbitrary-1, rust-derive-arbitrary, rust-tracing-subscriber-0.3, rust-tracing-tree-0.2. <#:phases>: Remove patch-build-failures. Add install-doc, chdir phase. Remove replace install phase. Replace install-license-files phase. Update fix-tests phase --- gnu/packages/rust-apps.scm | 88 +++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7dd60dd35b..2831b1401f 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2020–2022 Nicolas Goaziou ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Petr Hodina @@ -1161,7 +1161,7 @@ (define-public watchexec (define-public rust-analyzer (package (name "rust-analyzer") - (version "2021-06-07") + (version "2022-01-10") (source (origin ;; The crate at "crates.io" is empty. @@ -1172,35 +1172,52 @@ (define-public rust-analyzer (file-name (git-file-name name version)) (sha256 (base32 - "06bc3s5kjwpyr2cq79p0306a9bqp3xp928d750ybby9npq2dvj3z")))) + "1ci85bp8xwqrk8nqr8sh6yj8njgd98nhgnhaks2g00c77wwyra41")))) (build-system cargo-build-system) (arguments `(#:install-source? #f ; virtual manifest + #:rust ,rust-1.57 #:cargo-test-flags '("--release" "--" "--skip=tests::test_version_check" ;; It need rustc's version ;; FIXME: Guix's rust not install source in %out/lib/rustlib/src/rust ;; so "can't load standard library from sysroot" "--skip=tests::test_loading_rust_analyzer" + ;; Failed to run rustfmt from toolchain 'stable'. + ;; Please run `rustup component add rustfmt --toolchain stable` to install it + "--skip=tests::sourcegen::sourcegen_assists_docs" ;; Need rustfmt + "--skip=tests::sourcegen_ast::sourcegen_ast" ;; Same + "--skip=tidy::cargo_files_are_tidy" ;; Not need "--skip=tidy::check_licenses" ;; It run cargo metadata. "--skip=tidy::check_merge_commits" ;; It run git rev-list. "--skip=tidy::check_code_formatting" ;; Need rustfmt as cargo fmt "--skip=tidy::generate_grammar" ;; Same "--skip=tidy::generate_assists_tests") ;; Same + #:cargo-development-inputs + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) + ("rust-expect-test" ,rust-expect-test-1) + ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-quote" ,rust-quote-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-tracing-tree" ,rust-tracing-tree-0.2) + ("rust-ungrammar" ,rust-ungrammar-1)) #:cargo-inputs (("rust-always-assert" ,rust-always-assert-0.1) ("rust-anyhow" ,rust-anyhow-1) ("rust-anymap" ,rust-anymap-0.12) ("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-cargo-metadata" ,rust-cargo-metadata-0.13) + ("rust-cargo-metadata" ,rust-cargo-metadata-0.14) ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-chalk-ir" ,rust-chalk-ir-0.68) - ("rust-chalk-recursive" ,rust-chalk-recursive-0.68) - ("rust-chalk-solve" ,rust-chalk-solve-0.68) - ("rust-countme" ,rust-countme-2) - ("rust-cov-mark" ,rust-cov-mark-1) + ("rust-chalk-ir" ,rust-chalk-ir-0.75) + ("rust-chalk-recursive" ,rust-chalk-recursive-0.75) + ("rust-chalk-solve" ,rust-chalk-solve-0.75) + ("rust-countme" ,rust-countme-3) + ("rust-cov-mark" ,rust-cov-mark-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-dashmap" ,rust-dashmap-4) ("rust-dissimilar" ,rust-dissimilar-1) @@ -1209,7 +1226,6 @@ (define-public rust-analyzer ("rust-either" ,rust-either-1) ("rust-ena" ,rust-ena-0.14) ("rust-env-logger" ,rust-env-logger-0.8) - ("rust-expect-test" ,rust-expect-test-1) ("rust-flate2" ,rust-flate2-1) ("rust-fst" ,rust-fst-0.4) ("rust-home" ,rust-home-0.5) @@ -1220,29 +1236,27 @@ (define-public rust-analyzer ("rust-libloading" ,rust-libloading-0.7) ("rust-log" ,rust-log-0.4) ("rust-lsp-server" ,rust-lsp-server-0.5) - ("rust-lsp-types" ,rust-lsp-types-0.89) - ("rust-memmap2" ,rust-memmap2-0.2) + ("rust-lsp-types" ,rust-lsp-types-0.91) + ("rust-memmap2" ,rust-memmap2-0.5) ("rust-mimalloc" ,rust-mimalloc-0.1) - ("rust-miow" ,rust-miow-0.3) + ("rust-miow" ,rust-miow-0.4) ("rust-notify" ,rust-notify-5) - ("rust-object" ,rust-object-0.24) + ("rust-object" ,rust-object-0.28) ("rust-once-cell" ,rust-once-cell-1) - ("rust-oorandom" ,rust-oorandom-11.1) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-perf-event" ,rust-perf-event-0.4) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8) - ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-6) - ("rust-quote" ,rust-quote-1) - ("rust-rayon" ,rust-rayon-1) - ("rust-rowan" ,rust-rowan-0.13) - ("rust-rustc-ap-rustc-lexer" ,rust-rustc-ap-rustc-lexer-721) + ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-7) + ("rust-rowan" ,rust-rowan-0.15) + ("rust-rustc-ap-rustc-lexer" ,rust-rustc-ap-rustc-lexer-725) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-salsa" ,rust-salsa-0.17) ("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1) + ("rust-typed-arena" ,rust-typed-arena-2) ("rust-smallvec" ,rust-smallvec-1) ("rust-smol-str" ,rust-smol-str-0.1) ("rust-snap" ,rust-snap-1) @@ -1250,10 +1264,6 @@ (define-public rust-analyzer ("rust-threadpool" ,rust-threadpool-1) ("rust-tikv-jemalloc-ctl" ,rust-tikv-jemalloc-ctl-0.4) ("rust-tikv-jemallocator" ,rust-tikv-jemallocator-0.4) - ("rust-tracing" ,rust-tracing-0.1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2) - ("rust-tracing-tree" ,rust-tracing-tree-0.1) - ("rust-ungrammar" ,rust-ungrammar-1) ("rust-url" ,rust-url-2) ("rust-walkdir" ,rust-walkdir-2) ("rust-winapi" ,rust-winapi-0.3) @@ -1262,24 +1272,32 @@ (define-public rust-analyzer ("rust-xshell" ,rust-xshell-0.1)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-build-failures - (lambda _ - (chmod ".cargo/config" 420) - #t)) (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (let ((bash (string-append "#!" (which "bash")))) - (with-directory-excursion "crates/syntax/test_data/lexer/ok" - (substitute* "0010_single_line_comments.txt" + (with-directory-excursion "crates/parser/test_data/lexer/ok" + (substitute* "single_line_comments.txt" (("SHEBANG 19") (string-append "SHEBANG " (number->string (string-length bash)))) (("#!/usr/bin/env bash") bash)))))) - (replace 'install + (add-before 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) - (install-file "target/release/rust-analyzer" - (string-append (assoc-ref outputs "out") - "/bin"))))))) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/rust-analyzer-" + ,version))) + (copy-recursively "docs" doc)))) + (add-before 'install 'chdir + (lambda _ + (chdir "crates/rust-analyzer"))) + (replace 'install-license-files + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/rust-analyzer-" + ,version))) + (chdir "../..") + (install-file "LICENSE-MIT" doc) + (install-file "LICENSE-APACHE" doc))))))) (home-page "https://rust-analyzer.github.io/") (synopsis "Experimental Rust compiler front-end for IDEs") (description "Rust-analyzer is a modular compiler frontend for the Rust