Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rustup for openSUSE:Factory checked
in at 2022-10-04 20:37:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rustup (Old)
and /work/SRC/openSUSE:Factory/.rustup.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rustup"
Tue Oct 4 20:37:49 2022 rev:12 rq:1007773 version:1.25.1~23
Changes:
--------
--- /work/SRC/openSUSE:Factory/rustup/rustup.changes 2022-09-26
18:48:15.464060368 +0200
+++ /work/SRC/openSUSE:Factory/.rustup.new.2275/rustup.changes 2022-10-04
20:37:54.124931333 +0200
@@ -1,0 +2,11 @@
+Tue Oct 04 00:28:32 UTC 2022 - william.br...@suse.com
+
+- Update to version 1.25.1~23:
+ * Add support for loongarch64
+ * Add DisplayVersion for rustup to registry on Windows.
+ * Add `up` as an alias of `update`
+ * Move rust-analyzer to DUP_TOOLS
+ * Add rust-analyzer proxy.
+ * Improve error message when there is an error caused by override file
+
+-------------------------------------------------------------------
Old:
----
rustup-1.25.1~0.tar.xz
New:
----
rustup-1.25.1~23.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rustup.spec ++++++
--- /var/tmp/diff_new_pack.cBNo36/_old 2022-10-04 20:37:55.144932783 +0200
+++ /var/tmp/diff_new_pack.cBNo36/_new 2022-10-04 20:37:55.148932788 +0200
@@ -29,7 +29,7 @@
Obsoletes: %{1}1.51%{?2:-%{2}} < %{rust_version}
Name: rustup
-Version: 1.25.1~0
+Version: 1.25.1~23
Release: 0
Summary: A tool for managing user Rust toolchains
License: (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND
(Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR MIT OR
Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR
Zlib OR MIT) AND Apache-2.0 AND BSD-3-Clause AND CC0-1.0 AND ISC AND MIT
++++++ _service ++++++
--- /var/tmp/diff_new_pack.cBNo36/_old 2022-10-04 20:37:55.192932851 +0200
+++ /var/tmp/diff_new_pack.cBNo36/_new 2022-10-04 20:37:55.196932857 +0200
@@ -3,7 +3,9 @@
<param name="url">https://github.com/rust-lang/rustup.git</param>
<param name="versionformat">@PARENT_TAG@~@TAG_OFFSET@</param>
<param name="scm">git</param>
- <param name="revision">1.25.1</param>
+ <!-- Set this commit to add rust-analyzer support -->
+ <!-- <param name="revision">1.25.1</param> -->
+ <param name="revision">8f6b53628ad996ad86f9c6225fa500cddf860905</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ rustup-1.25.1~0.tar.xz -> rustup-1.25.1~23.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/rustup-1.25.1~0/.github/workflows/linux-builds-on-master.yaml
new/rustup-1.25.1~23/.github/workflows/linux-builds-on-master.yaml
--- old/rustup-1.25.1~0/.github/workflows/linux-builds-on-master.yaml
2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/.github/workflows/linux-builds-on-master.yaml
2022-08-27 13:23:46.000000000 +0200
@@ -33,7 +33,8 @@
- target: armv7-unknown-linux-gnueabihf
#snap_arch: armhf
steps:
- - uses: actions/checkout@v2
+ - name: Clone repo
+ uses: actions/checkout@v2
with:
# v2 defaults to a shallow checkout, but we need at least to the
previous tag
fetch-depth: 0
@@ -145,25 +146,6 @@
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-west-1
if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
- - name: Build a snapcraft configuration file
- run: |
- bash ci/snapcraft.bash
- if: matrix.snap_arch != ''
- env:
- DO_SNAP: 1
- SNAP_ARCH: ${{ matrix.snap_arch }}
- SNAP_EDGE: 1 # skip-stable
- - uses: snapcore/action-build@v1
- id: snapcraftbuild
- with:
- path: snapcraft
- if: matrix.snap_arch != ''
- - uses: snapcore/action-publish@v1
- with:
- store_login: ${{ secrets.SNAPCRAFT_TOKEN }}
- snap: ${{ steps.snapcraftbuild.outputs.snap }}
- release: edge # skip-pr skip-stable
- if: matrix.snap_arch != '' # skip-pr
- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features
ci-autoclean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/rustup-1.25.1~0/.github/workflows/linux-builds-on-pr.yaml
new/rustup-1.25.1~23/.github/workflows/linux-builds-on-pr.yaml
--- old/rustup-1.25.1~0/.github/workflows/linux-builds-on-pr.yaml
2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/.github/workflows/linux-builds-on-pr.yaml
2022-08-27 13:23:46.000000000 +0200
@@ -26,7 +26,8 @@
- target: armv7-unknown-linux-gnueabihf
#snap_arch: armhf
steps:
- - uses: actions/checkout@v2
+ - name: Clone repo
+ uses: actions/checkout@v2
with:
# v2 defaults to a shallow checkout, but we need at least to the
previous tag
fetch-depth: 0
@@ -138,24 +139,6 @@
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-west-1
if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
- - name: Build a snapcraft configuration file
- run: |
- bash ci/snapcraft.bash
- if: matrix.snap_arch != ''
- env:
- DO_SNAP: 1
- SNAP_ARCH: ${{ matrix.snap_arch }}
- SNAP_EDGE: 1 # skip-stable
- - uses: snapcore/action-build@v1
- id: snapcraftbuild
- with:
- path: snapcraft
- if: matrix.snap_arch != ''
- - uses: snapcore/action-publish@v1
- with:
- store_login: ${{ secrets.SNAPCRAFT_TOKEN }}
- snap: ${{ steps.snapcraftbuild.outputs.snap }}
- if: matrix.snap_arch == 'not-for-prs' # skip-master skip-stable
- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features
ci-autoclean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/rustup-1.25.1~0/.github/workflows/linux-builds-on-stable.yaml
new/rustup-1.25.1~23/.github/workflows/linux-builds-on-stable.yaml
--- old/rustup-1.25.1~0/.github/workflows/linux-builds-on-stable.yaml
2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/.github/workflows/linux-builds-on-stable.yaml
2022-08-27 13:23:46.000000000 +0200
@@ -56,7 +56,8 @@
- target: s390x-unknown-linux-gnu # skip-pr skip-master
#snap_arch: s390x # skip-pr skip-master
steps:
- - uses: actions/checkout@v2
+ - name: Clone repo
+ uses: actions/checkout@v2
with:
# v2 defaults to a shallow checkout, but we need at least to the
previous tag
fetch-depth: 0
@@ -168,24 +169,6 @@
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-west-1
if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
- - name: Build a snapcraft configuration file
- run: |
- bash ci/snapcraft.bash
- if: matrix.snap_arch != ''
- env:
- DO_SNAP: 1
- SNAP_ARCH: ${{ matrix.snap_arch }}
- - uses: snapcore/action-build@v1
- id: snapcraftbuild
- with:
- path: snapcraft
- if: matrix.snap_arch != ''
- - uses: snapcore/action-publish@v1
- with:
- store_login: ${{ secrets.SNAPCRAFT_TOKEN }}
- snap: ${{ steps.snapcraftbuild.outputs.snap }}
- release: beta # skip-pr skip-master
- if: matrix.snap_arch != '' # skip-pr
- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features
ci-autoclean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/CHANGELOG.md
new/rustup-1.25.1~23/CHANGELOG.md
--- old/rustup-1.25.1~0/CHANGELOG.md 2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/CHANGELOG.md 2022-08-27 13:23:46.000000000 +0200
@@ -17,7 +17,7 @@
- Manish Goregaokar
- Robert Collins
-[1.25.1]: https://github.com/rust-lang/rustup/release/tag/1.25.1
+[1.25.1]: https://github.com/rust-lang/rustup/releases/tag/1.25.1
## [1.25.0] - 2022-07-11
@@ -106,7 +106,7 @@
- Emil Gardstr??m (emilgardis)
- Arlo Siemsen (arlosi)
-[1.25.0]: https://github.com/rust-lang/rustup/release/tag/1.25.0
+[1.25.0]: https://github.com/rust-lang/rustup/releases/tag/1.25.0
[pr#2968]: https://github.com/rust-lang/rustup/pull/2968
[pr#2992]: https://github.com/rust-lang/rustup/pull/2992
[pr#2978]: https://github.com/rust-lang/rustup/pull/2978
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/rustup-1.25.1~0/ci/actions-templates/linux-builds-template.yaml
new/rustup-1.25.1~23/ci/actions-templates/linux-builds-template.yaml
--- old/rustup-1.25.1~0/ci/actions-templates/linux-builds-template.yaml
2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/ci/actions-templates/linux-builds-template.yaml
2022-08-27 13:23:46.000000000 +0200
@@ -64,7 +64,8 @@
- target: s390x-unknown-linux-gnu # skip-pr skip-master
#snap_arch: s390x # skip-pr skip-master
steps:
- - uses: actions/checkout@v2
+ - name: Clone repo
+ uses: actions/checkout@v2
with:
# v2 defaults to a shallow checkout, but we need at least to the
previous tag
fetch-depth: 0
@@ -176,27 +177,6 @@
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: us-west-1
if: github.event_name == 'push' && github.ref == 'refs/heads/stable'
- - name: Build a snapcraft configuration file
- run: |
- bash ci/snapcraft.bash
- if: matrix.snap_arch != ''
- env:
- DO_SNAP: 1
- SNAP_ARCH: ${{ matrix.snap_arch }}
- SNAP_EDGE: 1 # skip-stable
- - uses: snapcore/action-build@v1
- id: snapcraftbuild
- with:
- path: snapcraft
- if: matrix.snap_arch != ''
- - uses: snapcore/action-publish@v1
- with:
- store_login: ${{ secrets.SNAPCRAFT_TOKEN }}
- snap: ${{ steps.snapcraftbuild.outputs.snap }}
- release: edge # skip-pr skip-stable
- release: beta # skip-pr skip-master
- if: matrix.snap_arch != '' # skip-pr
- if: matrix.snap_arch == 'not-for-prs' # skip-master skip-stable
- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features
ci-autoclean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/ci/snapcraft.bash
new/rustup-1.25.1~23/ci/snapcraft.bash
--- old/rustup-1.25.1~0/ci/snapcraft.bash 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/ci/snapcraft.bash 1970-01-01 01:00:00.000000000
+0100
@@ -1,125 +0,0 @@
-#!/bin/bash
-
-set -efu
-
-set -o pipefail
-
-# This script encapsulates the job of preparing snapcract configuration for the
-# rustup snap. We construct either an edge snap (builds on PRs or master)
-# or a beta snap if built from a non-master branch.
-
-# If built on master, we should publish the edge snap
-# If built on stable, we should publish the beta snap
-
-# To parameterise the build, the following environment variables are needed:
-# DO_SNAP=1 <-- without this, we don't run
-# SNAP_EDGE=1 <-- with this, we build an edge/devel snap, otherwise a release
snap
-# SNAP_ARCH=... <-- without this we cannot build, this is the snap
architecture we're building
-
-if [ -z "${DO_SNAP:-}" ]; then
- echo "SNAP: Not attempting to snap"
- exit 0
-fi
-
-if [ -z "${SNAP_ARCH:-}" ]; then
- echo "SNAP: Unable to generate snap, architecture unset"
- exit 1
-else
- echo "SNAP: Constructing snap for architecture $SNAP_ARCH"
-fi
-
-if [ -n "${SNAP_EDGE:-}" ]; then
- echo "SNAP: Generated snap will be an grade:devel snap"
- GRADE=devel
-else
- echo "SNAP: Generated snap will be a grade:stable snap"
- GRADE=stable
-fi
-
-
-# This is the list of proxies which the snap will contain. This needs to match
-# the set of aliases which the snap has been allocated. If we add to this
-# list but don't get the aliases added, then people won't see the proxy except
-# as rustup.$PROXY. If we have an alias which is not a supported proxy name
-# then rustup might get sad.
-
-PROXIES="cargo cargo-clippy cargo-fmt cargo-miri clippy-driver rls rustc
rustdoc rustfmt"
-
-# From now on, things should be automagic
-
-VERSION=$(grep "^version" Cargo.toml | head -1 | cut -d\" -f2)
-
-rm -rf snapcraft
-
-mkdir -p snapcraft/snap
-
-cd snapcraft
-
-cat > snap/snapcraft.yaml <<SNAP
-name: rustup
-version: $VERSION
-confinement: classic
-base: core18
-architectures:
- - build-on: [amd64]
- run-on: [$SNAP_ARCH]
-description: |
- Rustup is the Rust Language's installer and primary front-end. You probably
- want this if you want to develop anything written in Rust.
-SNAP
-
-if [ -n "${SNAP_EDGE:-1}" ]; then
- cat >> snap/snapcraft.yaml <<SNAP
-
- Please note, this snap is experimental and functionality cannot be guaranteed
- to be consistent with released snaps.
-summary: "EXPERIMENTAL: The Rust Language Installer"
-grade: $GRADE
-SNAP
-else
- cat >> snap/snapcraft.yaml <<SNAP
-summary: "The Rust Language Installer"
-grade: $GRADE
-SNAP
-fi
-
-cat >> snap/snapcraft.yaml <<SNAP
-parts:
- rustup:
- plugin: nil
- build-attributes: [no-patchelf]
- source: inputs
- override-build: |
- mkdir -p \$SNAPCRAFT_PART_INSTALL/bin
- cp rustup-init \$SNAPCRAFT_PART_INSTALL/bin/rustup
-SNAP
-
-for PROXY in $PROXIES; do
- cat >> snap/snapcraft.yaml <<SNAP
- ln \$SNAPCRAFT_PART_INSTALL/bin/rustup
\$SNAPCRAFT_PART_INSTALL/bin/$PROXY
-SNAP
-done
-
-cat >> snap/snapcraft.yaml << 'SNAP'
- prime:
- - "-rustup-init"
-
-environment:
- RUSTUP_HOME: "$SNAP_USER_COMMON/rustup"
-
-apps:
- rustup:
- command: bin/rustup
-SNAP
-
-for PROXY in $PROXIES; do
- cat >> snap/snapcraft.yaml <<SNAP
- $PROXY:
- command: bin/$PROXY
-SNAP
-done
-
-mkdir inputs
-cp ../target/"$TARGET"/release/rustup-init inputs/
-
-ls -l snap/snapcraft.yaml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/basics.md
new/rustup-1.25.1~23/doc/src/basics.md
--- old/rustup-1.25.1~0/doc/src/basics.md 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/doc/src/basics.md 2022-08-27 13:23:46.000000000
+0200
@@ -21,8 +21,8 @@
info: installing component 'rust-std'
info: installing component 'rust-docs'
info: installing component 'cargo'
-info: checking for self-updates
-info: downloading self-updates
+info: checking for self-update
+info: downloading self-update
stable updated: rustc 1.7.0 (a5d1e7a59 2016-02-29)
@@ -33,7 +33,7 @@
If your `rustup` was built with the [no-self-update
feature](https://github.com/rust-lang/rustup/blob/master/Cargo.toml#L25), it
can not update
itself. This is not the default, and only versions of `rustup` built with
`--no-default-features`, or obtained from a third-party distributor who has
-disabled it (such as the Ubuntu snap store).
+disabled it (such as Nixos).
Otherwise Rustup can update itself. It is possible to control Rustup's
automatic
self update mechanism with the `auto-self-update` configuration variable. This
@@ -49,8 +49,8 @@
```console
$ rustup self update
-info: checking for self-updates
-info: downloading self-updates
+info: checking for self-update
+info: downloading self-update
```
### Disabling self updates on a per-invocation basis
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/concepts/channels.md
new/rustup-1.25.1~23/doc/src/concepts/channels.md
--- old/rustup-1.25.1~0/doc/src/concepts/channels.md 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/doc/src/concepts/channels.md 2022-08-27
13:23:46.000000000 +0200
@@ -77,8 +77,8 @@
$ rustup update
info: syncing channel updates for 'stable'
info: syncing channel updates for 'nightly'
-info: checking for self-updates
-info: downloading self-updates
+info: checking for self-update
+info: downloading self-update
stable unchanged: rustc 1.7.0 (a5d1e7a59 2016-02-29)
nightly unchanged: rustc 1.9.0-nightly (02310fd31 2016-03-19)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/concepts/components.md
new/rustup-1.25.1~23/doc/src/concepts/components.md
--- old/rustup-1.25.1~0/doc/src/concepts/components.md 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/doc/src/concepts/components.md 2022-08-27
13:23:46.000000000 +0200
@@ -40,8 +40,10 @@
* `rust-docs` ??? This is a local copy of the [Rust documentation]. Use the
`rustup doc` command to open the documentation in a web browser. Run `rustup
doc --help` for more options.
-* `rls` ?????[RLS] is a language server that provides support for editors and
- IDEs.
+* `rust-analyzer` ??? [rust-analyzer] is a language server that provides
support
+ for editors and IDEs.
+* `rls` ??? [RLS] is a language server that is deprecated and has been replaced
+ by rust-analyzer.
* `clippy` ?????[Clippy] is a lint tool that provides extra checks for common
mistakes and stylistic choices.
* `miri` ?????[Miri] is an experimental Rust interpreter, which can be used for
@@ -76,6 +78,7 @@
[build-std]:
https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#build-std
[miri]: https://github.com/rust-lang/miri/
[RLS]: https://github.com/rust-lang/rls
+[rust-analyzer]: https://rust-analyzer.github.io/
[rustdoc]: https://doc.rust-lang.org/rustdoc/
[cargo]: https://doc.rust-lang.org/cargo/
[clippy]: https://github.com/rust-lang/rust-clippy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/concepts/profiles.md
new/rustup-1.25.1~23/doc/src/concepts/profiles.md
--- old/rustup-1.25.1~0/doc/src/concepts/profiles.md 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/doc/src/concepts/profiles.md 2022-08-27
13:23:46.000000000 +0200
@@ -16,7 +16,7 @@
`rustup`. This should never be used, as it includes *every* component ever
included in the metadata and thus will almost always fail. If you are
looking for a way to install devtools such as `miri` or IDE integration
- tools (`rls`), you should use the `default` profile and
+ tools (`rust-analyzer`), you should use the `default` profile and
install the needed additional components manually, either by using `rustup
component add` or by using `-c` when installing the toolchain.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/concepts/proxies.md
new/rustup-1.25.1~23/doc/src/concepts/proxies.md
--- old/rustup-1.25.1~0/doc/src/concepts/proxies.md 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/doc/src/concepts/proxies.md 2022-08-27
13:23:46.000000000 +0200
@@ -16,8 +16,10 @@
- `rust-lldb`, `rust-gdb`, and `rust-gdbgui` are simple wrappers around the
`lldb`, `gdb`, and `gdbgui` debuggers respectively. The wrappers enable some
pretty-printing of Rust values and add some convenience features to the
debuggers by means of their scripting interfaces.
-- `rls` is part of the Rust IDE integration tooling. It implements the
language-server protocol to permit IDEs and editors such as Visual Studio Code,
ViM, or Emacs, access to the semantics of the Rust code you are editing. It
comes from the `rls` component.
+- `rust-analyzer` is part of the Rust IDE integration tooling. It implements
the language-server protocol to permit IDEs and editors such as Visual Studio
Code, ViM, or Emacs, access to the semantics of the Rust code you are editing.
It comes from the `rust-analyzer` component.
- `cargo-clippy` and `clippy-driver` are related to the `clippy` linting tool
which provides extra checks for common mistakes and stylistic choices and it
comes from the `clippy` component.
- `cargo-miri` is an experimental interpreter for Rust's mid-level
intermediate representation (MIR) and it comes from the `miri` component.
+
+- `rls` is a deprecated IDE tool that has been replaced by `rust-analyzer`. It
comes from the `rls` component.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/doc/src/environment-variables.md
new/rustup-1.25.1~23/doc/src/environment-variables.md
--- old/rustup-1.25.1~0/doc/src/environment-variables.md 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/doc/src/environment-variables.md 2022-08-27
13:23:46.000000000 +0200
@@ -17,7 +17,7 @@
Deprecated. Use `RUSTUP_DIST_SERVER` instead.
- `RUSTUP_UPDATE_ROOT` (default `https://static.rust-lang.org/rustup`) Sets
- the root URL for downloading self-updates.
+ the root URL for downloading self-update.
- `RUSTUP_IO_THREADS` *unstable* (defaults to reported cpu count). Sets the
number of threads to perform close IO in. Set to `1` to force
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/rustup-init.sh
new/rustup-1.25.1~23/rustup-init.sh
--- old/rustup-1.25.1~0/rustup-init.sh 2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/rustup-init.sh 2022-08-27 13:23:46.000000000 +0200
@@ -72,7 +72,11 @@
local _url="${RUSTUP_UPDATE_ROOT}/dist/${_arch}/rustup-init${_ext}"
local _dir
- _dir="$(ensure mktemp -d)"
+ if ! _dir="$(ensure mktemp -d)"; then
+ # Because the previous command ran in a subshell, we must manually
+ # propagate exit status.
+ exit 1
+ fi
local _file="${_dir}/rustup-init${_ext}"
local _ansi_escapes_are_valid=false
@@ -366,6 +370,9 @@
riscv64)
_cputype=riscv64gc
;;
+ loongarch64)
+ _cputype=loongarch64
+ ;;
*)
err "unknown CPU type: $_cputype"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/cli/common.rs
new/rustup-1.25.1~23/src/cli/common.rs
--- old/rustup-1.25.1~0/src/cli/common.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/src/cli/common.rs 2022-08-27 13:23:46.000000000
+0200
@@ -292,23 +292,6 @@
Ok(SelfUpdatePermission::Permit)
} else {
// Detect if rustup is not meant to self-update
- match process().var("SNAP") {
- Ok(_) => {
- // We're running under snappy so don't even bother
- // trying to self-update
- // TODO: Report this to the user?
- // TODO: Maybe ask snapd if there's an update and report
- // that to the user instead?
- debug!("Skipping self-update because SNAP was detected");
- if explicit {
- return Ok(SelfUpdatePermission::HardFail);
- } else {
- return Ok(SelfUpdatePermission::Skip);
- }
- }
- Err(env::VarError::NotPresent) => {}
- Err(e) => return Err(e).context("Could not interrogate SNAP
environment variable"),
- }
let current_exe = env::current_exe()?;
let current_exe_dir = current_exe.parent().expect("Rustup isn't in a
directory???");
if let Err(e) = tempfile::Builder::new()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/cli/rustup_mode.rs
new/rustup-1.25.1~23/src/cli/rustup_mode.rs
--- old/rustup-1.25.1~0/src/cli/rustup_mode.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/src/cli/rustup_mode.rs 2022-08-27 13:23:46.000000000
+0200
@@ -313,7 +313,7 @@
.subcommand(
SubCommand::with_name("update")
.about("Update Rust toolchains and rustup")
- .aliases(&["upgrade"])
+ .aliases(&["upgrade", "up"])
.after_help(UPDATE_HELP)
.arg(
Arg::with_name("toolchain")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/cli/self_update/test.rs
new/rustup-1.25.1~23/src/cli/self_update/test.rs
--- old/rustup-1.25.1~0/src/cli/self_update/test.rs 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/src/cli/self_update/test.rs 2022-08-27
13:23:46.000000000 +0200
@@ -29,7 +29,7 @@
.open_subkey_with_flags("Environment", KEY_READ | KEY_WRITE)
.unwrap();
if let Some(p) = p.as_ref() {
- environment.set_raw_value("PATH", &p).unwrap();
+ environment.set_raw_value("PATH", p).unwrap();
} else {
let _ = environment.delete_value("PATH");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/cli/self_update/windows.rs
new/rustup-1.25.1~23/src/cli/self_update/windows.rs
--- old/rustup-1.25.1~0/src/cli/self_update/windows.rs 2022-07-12
22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/src/cli/self_update/windows.rs 2022-08-27
13:23:46.000000000 +0200
@@ -523,10 +523,14 @@
vtype: RegType::REG_SZ,
};
+ let current_version: &str = env!("CARGO_PKG_VERSION");
+
key.set_raw_value("UninstallString", ®_value)
.context("Failed to set uninstall string")?;
key.set_value("DisplayName", &"Rustup: the Rust toolchain installer")
.context("Failed to set display name")?;
+ key.set_value("DisplayVersion", ¤t_version)
+ .context("Failed to set display version")?;
Ok(())
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/cli/self_update.rs
new/rustup-1.25.1~23/src/cli/self_update.rs
--- old/rustup-1.25.1~0/src/cli/self_update.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/src/cli/self_update.rs 2022-08-27 13:23:46.000000000
+0200
@@ -546,7 +546,7 @@
if let Err(path) = rustc_or_cargo_exists_in_path() {
warn!("it looks like you have an existing installation of Rust at:");
warn!("{}", path);
- warn!("rustup should not be installed alongside Rust. Please uninstall
your existing Rust first.");
+ warn!("It is recommended that rustup be the primary Rust
installation.");
warn!("Otherwise you may have confusion unless you are careful with
your PATH");
warn!("If you are sure that you want both rustup and your already
installed Rust");
warn!("then please reply `y' or `yes' or set
RUSTUP_INIT_SKIP_PATH_CHECK to yes");
@@ -1132,7 +1132,7 @@
let current_version = env!("CARGO_PKG_VERSION");
// Get available version
- info!("checking for self-updates");
+ info!("checking for self-update");
let available_version = get_available_rustup_version()?;
// If up-to-date
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/config.rs
new/rustup-1.25.1~23/src/config.rs
--- old/rustup-1.25.1~0/src/config.rs 2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/src/config.rs 2022-08-27 13:23:46.000000000 +0200
@@ -673,13 +673,16 @@
};
if let Ok(contents) = contents {
- let override_file = Cfg::parse_override_file(contents,
parse_mode)?;
+ let add_file_context = || format!("in {}",
toolchain_file.to_string_lossy());
+ let override_file = Cfg::parse_override_file(contents,
parse_mode)
+ .with_context(add_file_context)?;
if let Some(toolchain_name) = &override_file.toolchain.channel
{
- let all_toolchains = self.list_toolchains()?;
+ let all_toolchains =
self.list_toolchains().with_context(add_file_context)?;
if !all_toolchains.iter().any(|s| s == toolchain_name) {
// The given name is not resolvable as a toolchain, so
// instead check it's plausible for installation later
- dist::validate_channel_name(toolchain_name)?;
+ dist::validate_channel_name(toolchain_name)
+ .with_context(add_file_context)?;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/dist/triple.rs
new/rustup-1.25.1~23/src/dist/triple.rs
--- old/rustup-1.25.1~0/src/dist/triple.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/src/dist/triple.rs 2022-08-27 13:23:46.000000000
+0200
@@ -22,6 +22,7 @@
"powerpc64le",
"riscv64gc",
"s390x",
+ "loongarch64",
];
static LIST_OSES: &[&str] = &[
"pc-windows",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/lib.rs
new/rustup-1.25.1~23/src/lib.rs
--- old/rustup-1.25.1~0/src/lib.rs 2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/src/lib.rs 2022-08-27 13:23:46.000000000 +0200
@@ -35,7 +35,7 @@
// Tools which are commonly installed by Cargo as well as rustup. We take a bit
// more care with these to ensure we don't overwrite the user's previous
// installation.
-pub static DUP_TOOLS: &[&str] = &["rustfmt", "cargo-fmt"];
+pub static DUP_TOOLS: &[&str] = &["rust-analyzer", "rustfmt", "cargo-fmt"];
// If the given name is one of the tools we proxy.
pub fn is_proxyable_tools(tool: &str) -> Result<()> {
@@ -110,12 +110,12 @@
for tool in DUP_TOOLS {
assert!(is_proxyable_tools(tool).is_ok());
}
- let message = &"unknown proxy name: 'unknown-tool'; valid proxy names
are 'rustc', \
- 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rust-gdbgui', 'rls',
'cargo-clippy', \
- 'clippy-driver', 'cargo-miri', 'rustfmt', 'cargo-fmt'";
- assert!(is_proxyable_tools("unknown-tool")
- .unwrap_err()
- .to_string()
- .eq(message));
+ let message = "unknown proxy name: 'unknown-tool'; valid proxy names
are 'rustc', \
+ 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rust-gdbgui', 'rls', \
+ 'cargo-clippy', 'clippy-driver', 'cargo-miri', 'rust-analyzer',
'rustfmt', 'cargo-fmt'";
+ assert_eq!(
+ is_proxyable_tools("unknown-tool").unwrap_err().to_string(),
+ message
+ );
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/src/test.rs
new/rustup-1.25.1~23/src/test.rs
--- old/rustup-1.25.1~0/src/test.rs 2022-07-12 22:15:22.000000000 +0200
+++ new/rustup-1.25.1~23/src/test.rs 2022-08-27 13:23:46.000000000 +0200
@@ -99,6 +99,8 @@
"riscv64gc"
} else if cfg!(target_arch = "aarch64") {
"aarch64"
+ } else if cfg!(target_arch = "loongarch64") {
+ "loongarch64"
} else {
unimplemented!()
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/tests/cli-exact.rs
new/rustup-1.25.1~23/tests/cli-exact.rs
--- old/rustup-1.25.1~0/tests/cli-exact.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/tests/cli-exact.rs 2022-08-27 13:23:46.000000000
+0200
@@ -114,7 +114,7 @@
info: installing component 'rust-docs'
info: installing component 'rust-std'
info: installing component 'rustc'
-info: checking for self-updates
+info: checking for self-update
info: downloading self-update
"
),
@@ -170,6 +170,9 @@
expect_ok(config, &["rustup", "upgrade", "stable"]);
expect_ok(config, &["rustup", "upgrade", "beta"]);
expect_ok(config, &["rustup", "upgrade", "nightly"]);
+ expect_ok(config, &["rustup", "up", "stable"]);
+ expect_ok(config, &["rustup", "up", "beta"]);
+ expect_ok(config, &["rustup", "up", "nightly"]);
expect_stdout_ok(
config,
&["rustup", "check"],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/tests/cli-misc.rs
new/rustup-1.25.1~23/tests/cli-misc.rs
--- old/rustup-1.25.1~0/tests/cli-misc.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/tests/cli-misc.rs 2022-08-27 13:23:46.000000000
+0200
@@ -411,7 +411,10 @@
expect_err(
config,
broken,
- "unknown proxy name: 'fake_proxy'; valid proxy names are 'rustc',
'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb', 'rust-gdbgui', 'rls',
'cargo-clippy', 'clippy-driver', 'cargo-miri', 'rustfmt', 'cargo-fmt'",
+ "unknown proxy name: 'fake_proxy'; valid proxy names are \
+ 'rustc', 'rustdoc', 'cargo', 'rust-lldb', 'rust-gdb',
'rust-gdbgui', \
+ 'rls', 'cargo-clippy', 'clippy-driver', 'cargo-miri', \
+ 'rust-analyzer', 'rustfmt', 'cargo-fmt'",
);
// Hardlink will be automatically cleaned up by test setup code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/tests/cli-self-upd.rs
new/rustup-1.25.1~23/tests/cli-self-upd.rs
--- old/rustup-1.25.1~0/tests/cli-self-upd.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/tests/cli-self-upd.rs 2022-08-27 13:23:46.000000000
+0200
@@ -299,7 +299,7 @@
#[test]
fn update_exact() {
let version = env!("CARGO_PKG_VERSION");
- let expected_output = "info: checking for self-updates
+ let expected_output = "info: checking for self-update
info: downloading self-update
"
.to_string();
@@ -439,7 +439,7 @@
",
version
),
- r"info: checking for self-updates
+ r"info: checking for self-update
",
);
});
@@ -512,7 +512,7 @@
),
for_host!(
r"info: syncing channel updates for 'stable-{0}'
-info: checking for self-updates
+info: checking for self-update
info: downloading self-update
info: cleaning up downloads & tmp directories
"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rustup-1.25.1~0/tests/mock/clitools.rs
new/rustup-1.25.1~23/tests/mock/clitools.rs
--- old/rustup-1.25.1~0/tests/mock/clitools.rs 2022-07-12 22:15:22.000000000
+0200
+++ new/rustup-1.25.1~23/tests/mock/clitools.rs 2022-08-27 13:23:46.000000000
+0200
@@ -566,7 +566,7 @@
A: AsRef<OsStr>,
{
// Only the rustup alias is currently ready for in-process testing:
- // - -init performs self-updates which monkey with global external state.
+ // - -init performs self-update which monkey with global external state.
// - proxies themselves behave appropriately the proxied output needs to be
// collected for assertions to be made on it as our tests traverse
layers.
// - self update executions cannot run in-process because on windows the
++++++ vendor.tar.xz ++++++
/work/SRC/openSUSE:Factory/rustup/vendor.tar.xz
/work/SRC/openSUSE:Factory/.rustup.new.2275/vendor.tar.xz differ: char 27, line
1
