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

Update links #2173

Merged
merged 3 commits into from
Dec 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
726 changes: 363 additions & 363 deletions CHANGELOG.md

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ name = "rustup"
version = "1.21.1"
authors = [ "Daniel Silverstone <dsilvers@digital-scurf.org>", "Diggory Blake <diggsey@googlemail.com>" ]
build = "build.rs"
documentation = "https://rust-lang.github.io/rustup.rs/rustup/index.html"
edition = "2018"
homepage = "https://github.com/rust-lang/rustup.rs"
homepage = "https://github.com/rust-lang/rustup"
keywords = ["rustup", "multirust", "install", "proxy"]
license = "MIT OR Apache-2.0"
readme = "README.md"
repository = "https://github.com/rust-lang/rustup.rs"
repository = "https://github.com/rust-lang/rustup"
description = "Manage multiple rust installations with ease"

[features]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ platforms The Rust Project publishes binary releases of the standard
library, and for some the full compiler. `rustup` gives easy access
to all of them.

[p]: https://forge.rust-lang.org/platform-support.html
[p]: https://forge.rust-lang.org/release/platform-support.html

When you first install a toolchain, `rustup` installs only the
standard library for your *host* platform - that is, the architecture
Expand Down Expand Up @@ -760,7 +760,7 @@ variable.
work][s]. `rustup` performs all downloads over HTTPS, but does not
yet validate signatures of downloads.

[s]: https://github.com/rust-lang/rustup.rs/issues?q=is%3Aopen+is%3Aissue+label%3Asecurity
[s]: https://github.com/rust-lang/rustup/issues?q=is%3Aopen+is%3Aissue+label%3Asecurity

File modes on installation honor umask as of 1.18.4, use umask if
very tight controls are desired.
Expand Down
2 changes: 1 addition & 1 deletion ci/build-run-docker.bash
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ docker run \
-c 'PATH="${PATH}":/rustc-sysroot/bin bash ci/run.bash'

# check that rustup-init was built with ssl support
# see https://github.com/rust-lang/rustup.rs/issues/1051
# see https://github.com/rust-lang/rustup/issues/1051
if ! (nm target/"${TARGET}"/release/rustup-init | grep -q Curl_ssl_version); then
echo "Missing ssl support!!!!" >&2
exit 1
Expand Down
2 changes: 1 addition & 1 deletion ci/run.bash
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case "$(uname -s)" in
* ) FEATURES=('--features' 'vendored-openssl') ;;
esac

# rustc only supports armv7: https://forge.rust-lang.org/platform-support.html
# rustc only supports armv7: https://forge.rust-lang.org/release/platform-support.html
if [ "$TARGET" = arm-linux-androideabi ]; then
export CFLAGS='-march=armv7'
fi
Expand Down
2 changes: 1 addition & 1 deletion src/cli/topical_doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn search_path(doc: &DocData, wpath: &Path, keywords: &[&str]) -> Result<PathBuf
pub fn local_path(root: &Path, topic: &str) -> Result<PathBuf> {
// The ORDER of keywords_top is used for the default search and should not
// be changed.
// https://github.com/rust-lang/rustup.rs/issues/2076#issuecomment-546613036
// https://github.com/rust-lang/rustup/issues/2076#issuecomment-546613036
let keywords_top = vec!["keyword", "primitive", "macro"];
let keywords_mod = ["fn", "struct", "trait", "enum", "type", "constant"];

Expand Down
2 changes: 1 addition & 1 deletion src/dist/component/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ fn unpack_without_first_dir<'a, R: Read>(
// - it is most likely an attack, as rusts cross-platform nature precludes
// such artifacts
let kind = entry.header().entry_type();
// https://github.com/rust-lang/rustup.rs/issues/1140 and before that
// https://github.com/rust-lang/rustup/issues/1140 and before that
// https://github.com/rust-lang/rust/issues/25479
// tl;dr: code got convoluted and we *may* have damaged tarballs out
// there.
Expand Down
2 changes: 1 addition & 1 deletion src/dist/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ impl Package {
tpkgs
.get(t)
.ok_or_else(|| format!("target '{}' not found in channel. \
Perhaps check https://forge.rust-lang.org/platform-support.html for available targets", t).into())
Perhaps check https://forge.rust-lang.org/release/platform-support.html for available targets", t).into())
} else {
Err("no target specified".into())
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ fn rename<'a, N>(
where
N: From<Notification<'a>>,
{
// https://github.com/rust-lang/rustup.rs/issues/1870
// https://github.com/rust-lang/rustup/issues/1870
// 21 fib steps from 1 sums to ~28 seconds, hopefully more than enough
// for our previous poor performance that avoided the race condition with
// McAfee and Norton.
Expand Down
4 changes: 2 additions & 2 deletions tests/cli-exact.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ fn update_invalid_toolchain() {
r"",
r"info: syncing channel updates for 'nightly-2016-03-1'
info: latest update on 2015-01-02, rust version 1.3.0 (hash-nightly-2)
error: target '2016-03-1' not found in channel. Perhaps check https://forge.rust-lang.org/platform-support.html for available targets
error: target '2016-03-1' not found in channel. Perhaps check https://forge.rust-lang.org/release/platform-support.html for available targets
",
);
});
Expand All @@ -442,7 +442,7 @@ fn default_invalid_toolchain() {
r"",
r"info: syncing channel updates for 'nightly-2016-03-1'
info: latest update on 2015-01-02, rust version 1.3.0 (hash-nightly-2)
error: target '2016-03-1' not found in channel. Perhaps check https://forge.rust-lang.org/platform-support.html for available targets
error: target '2016-03-1' not found in channel. Perhaps check https://forge.rust-lang.org/release/platform-support.html for available targets
",
);
});
Expand Down
6 changes: 3 additions & 3 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<p>
rustup runs on Windows, Linux, macOS, FreeBSD and NetBSD. If
you are on one of these platforms and are seeing this then please
<a href="https://github.com/rust-lang/rustup.rs/issues/new">report an issue</a>,
<a href="https://github.com/rust-lang/rustup/issues/new">report an issue</a>,
along with the following values:
</p>

Expand Down Expand Up @@ -133,11 +133,11 @@
<img src="https://www.rust-lang.org/logos/rust-logo-blk.svg" alt="" />
rustup is an official Rust project.
<br/>
<a href="https://github.com/rust-lang/rustup.rs/#other-installation-methods">other installation options</a>
<a href="https://github.com/rust-lang/rustup/#other-installation-methods">other installation options</a>
&nbsp;&middot;&nbsp;
<a href="https://rust-lang.github.io/rustup-components-history/">component availability</a>
&nbsp;&middot;&nbsp;
<a href="https://github.com/rust-lang/rustup.rs">about rustup</a>
<a href="https://github.com/rust-lang/rustup">about rustup</a>
</p>

<script src="rustup.js"></script>