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.

Sign up for GitHub

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

Rename references to multirust to rustup where applicable #1148

Merged
merged 2 commits into from
Jun 10, 2017
Merged

Rename references to multirust to rustup where applicable #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009239d
Rename references to multirust to rustup where applicable
Diggsey Jun 3, 2017
87d546f
Merge branch 'master' into db-rename-multirust-refs
Diggsey Jun 9, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ script:
# sudo make install && cd ../..;
# echo "Uploading coverage... $TRAVIS_JOB_ID";
# find target/debug/deps/*-* -executable -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
# find target/debug/*-* -executable ! -name multirust-rs -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
# find target/debug/*-* -executable ! -name rustup-rs -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
# fi
# prepare for a deploy if this will be a deployment
- bash ci/prepare-deploy-travis.sh
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
name = "rustup"
version = "1.4.0"
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
description = "multirust in rust - manage multiple rust installations with ease"
description = "Manage multiple rust installations with ease"

documentation = "http://rust-lang-nursery.github.io/rustup.rs/rustup/index.html"
homepage = "https://github.com/rust-lang-nursery/rustup.rs"
repository = "https://github.com/rust-lang-nursery/rustup.rs"

readme = "README.md"

keywords = ["multirust", "install", "proxy"]
keywords = ["rustup", "multirust", "install", "proxy"]

license = "MIT OR Apache-2.0"

Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,9 @@ Command | Description

## Environment variables

- `RUSTUP_HOME` (default: `~/.multirust` or `%USERPROFILE%/.multirust`)
- `RUSTUP_HOME` (default: `~/.rustup` or `%USERPROFILE%/.rustup`)
Sets the root rustup folder, used for storing installed
toolchains and configuration options. (rustup used to be called multirust. Use
of `.multirust` is a holdover from that. See #537.)
toolchains and configuration options.

- `RUSTUP_TOOLCHAIN` (default: none)
If set, will override the toolchain used for all rust tool
Expand Down
2 changes: 1 addition & 1 deletion ci/prepare-deploy-travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [[ "$TARGET" == "x86_64-unknown-linux-gnu" && "$TRAVIS_BRANCH" == "stable" ]]
#git config --global credential.helper store;
#echo "https://${TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials;
#cargo doc --release;
#echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
#echo '<meta http-equiv=refresh content=0;url=rustup/index.html>' > target/doc/index.html;
#sudo pip install ghp-import;
#ghp-import -n target/doc;
#git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;
Expand Down
2 changes: 1 addition & 1 deletion src/download/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ pub mod hyper_base {
let src = try!(url.to_file_path()
.map_err(|_| Error::from(format!("bogus file url: '{}'", url))));
if !src.is_file() {
// Because some of multirust's logic depends on checking
// Because some of rustup's logic depends on checking
// the error when a downloaded file doesn't exist, make
// the file case return the same error value as the
// network case.
Expand Down
4 changes: 2 additions & 2 deletions src/rustup-cli/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ fn run_rustup() -> Result<()> {
n.starts_with("rustup-init") => {
// NB: The above check is only for the prefix of the file
// name. Browsers rename duplicates to
// e.g. multirust-setup(2), and this allows all variations
// e.g. rustup-setup(2), and this allows all variations
// to work.
setup_mode::main()
}
Some(n) if n.starts_with("rustup-gc-") => {
// This is the final uninstallation stage on windows where
// multirust deletes its own exe
// rustup deletes its own exe
self_update::complete_windows_uninstall()
}
Some(n) if n.starts_with("multirust-") => {
Expand Down
2 changes: 1 addition & 1 deletion src/rustup-cli/self_update.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ pub fn uninstall(no_prompt: bool) -> Result<()> {
try!(utils::delete_legacy_multirust_symlink());

// Delete RUSTUP_HOME
let ref rustup_dir = try!(utils::multirust_home());
let ref rustup_dir = try!(utils::rustup_home());
if rustup_dir.exists() {
try!(utils::remove_dir("rustup_home", rustup_dir, &|_| {}));
}
Expand Down
8 changes: 4 additions & 4 deletions src/rustup-dist/tests/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ pub fn create_mock_channel(channel: &str, date: &str,

#[test]
fn mock_dist_server_smoke_test() {
let tempdir = TempDir::new("multirust").unwrap();
let tempdir = TempDir::new("rustup").unwrap();
let path = tempdir.path();

create_mock_dist_server(&path, None).write(&[ManifestVersion::V2], false);
Expand Down Expand Up @@ -309,12 +309,12 @@ fn uninstall(toolchain: &ToolchainDesc, prefix: &InstallPrefix, temp_cfg: &temp:

fn setup(edit: Option<&Fn(&str, &mut MockPackage)>, enable_xz: bool,
f: &Fn(&Url, &ToolchainDesc, &InstallPrefix, &DownloadCfg, &temp::Cfg)) {
let dist_tempdir = TempDir::new("multirust").unwrap();
let dist_tempdir = TempDir::new("rustup").unwrap();
create_mock_dist_server(dist_tempdir.path(), edit).write(&[ManifestVersion::V2], enable_xz);

let prefix_tempdir = TempDir::new("multirust").unwrap();
let prefix_tempdir = TempDir::new("rustup").unwrap();

let work_tempdir = TempDir::new("multirust").unwrap();
let work_tempdir = TempDir::new("rustup").unwrap();
let ref temp_cfg = temp::Cfg::new(work_tempdir.path().to_owned(),
DEFAULT_DIST_SERVER,
Box::new(|_| ()));
Expand Down
42 changes: 21 additions & 21 deletions src/rustup-dist/tests/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use rustup_mock::{MockInstallerBuilder, MockCommand};
// Just testing that the mocks work
#[test]
fn mock_smoke_test() {
let tempdir = TempDir::new("multirust").unwrap();
let tempdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand Down Expand Up @@ -51,7 +51,7 @@ fn mock_smoke_test() {

#[test]
fn package_contains() {
let tempdir = TempDir::new("multirust").unwrap();
let tempdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -73,7 +73,7 @@ fn package_contains() {

#[test]
fn package_bad_version() {
let tempdir = TempDir::new("multirust").unwrap();
let tempdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -91,7 +91,7 @@ fn package_bad_version() {

#[test]
fn basic_install() {
let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -106,10 +106,10 @@ fn basic_install() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
let prefix = InstallPrefix::from(instdir.path().to_owned());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand All @@ -131,7 +131,7 @@ fn basic_install() {

#[test]
fn multiple_component_install() {
let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -144,10 +144,10 @@ fn multiple_component_install() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
let prefix = InstallPrefix::from(instdir.path().to_owned());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand All @@ -169,7 +169,7 @@ fn multiple_component_install() {

#[test]
fn uninstall() {
let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -187,10 +187,10 @@ fn uninstall() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
let prefix = InstallPrefix::from(instdir.path().to_owned());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand Down Expand Up @@ -229,7 +229,7 @@ fn uninstall_best_effort() {

#[test]
fn component_bad_version() {
let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -239,10 +239,10 @@ fn component_bad_version() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
let prefix = InstallPrefix::from(instdir.path().to_owned());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand Down Expand Up @@ -270,7 +270,7 @@ fn unix_permissions() {
use std::os::unix::fs::PermissionsExt;
use std::fs;

let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -288,10 +288,10 @@ fn unix_permissions() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
let prefix = InstallPrefix::from(instdir.path().to_owned());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand Down Expand Up @@ -324,7 +324,7 @@ fn unix_permissions() {
// Installing to a prefix that doesn't exist creates it automatically
#[test]
fn install_to_prefix_that_does_not_exist() {
let pkgdir = TempDir::new("multirust").unwrap();
let pkgdir = TempDir::new("rustup").unwrap();

let mock = MockInstallerBuilder {
components: vec![("mycomponent".to_string(),
Expand All @@ -334,12 +334,12 @@ fn install_to_prefix_that_does_not_exist() {

mock.build(pkgdir.path());

let instdir = TempDir::new("multirust").unwrap();
let instdir = TempDir::new("rustup").unwrap();
// The directory that does not exist
let does_not_exist = instdir.path().join("super_not_real");
let prefix = InstallPrefix::from(does_not_exist.clone());

let tmpdir = TempDir::new("multirust").unwrap();
let tmpdir = TempDir::new("rustup").unwrap();
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
let notify = |_: Notification| ();
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);
Expand Down
Loading