Skip to content

Commit 830e7eb

Browse files
borsbors
committed
Auto merge of #1148 - rust-lang-nursery:db-rename-multirust-refs, r=brson
Rename references to multirust to rustup where applicable r? @brson
2 parents ecc480f + 87d546f commit 830e7eb

File tree

22 files changed

+131
-132
lines changed

22 files changed

+131
-132
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ script:
143143
# sudo make install && cd ../..;
144144
# echo "Uploading coverage... $TRAVIS_JOB_ID";
145145
# find target/debug/deps/*-* -executable -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
146-
# find target/debug/*-* -executable ! -name multirust-rs -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
146+
# find target/debug/*-* -executable ! -name rustup-rs -exec kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov '{}' \;;
147147
# fi
148148
# prepare for a deploy if this will be a deployment
149149
- bash ci/prepare-deploy-travis.sh

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
name = "rustup"
44
version = "1.4.0"
55
authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
6-
description = "multirust in rust - manage multiple rust installations with ease"
6+
description = "Manage multiple rust installations with ease"
77

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

1212
readme = "README.md"
1313

14-
keywords = ["multirust", "install", "proxy"]
14+
keywords = ["rustup", "multirust", "install", "proxy"]
1515

1616
license = "MIT OR Apache-2.0"
1717

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,9 @@ Command | Description
465465

466466
## Environment variables
467467

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

473472
- `RUSTUP_TOOLCHAIN` (default: none)
474473
If set, will override the toolchain used for all rust tool

‎ci/prepare-deploy-travis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [[ "$TARGET" == "x86_64-unknown-linux-gnu" && "$TRAVIS_BRANCH" == "stable" ]]
1717
#git config --global credential.helper store;
1818
#echo "https://${TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials;
1919
#cargo doc --release;
20-
#echo '<meta http-equiv=refresh content=0;url=multirust/index.html>' > target/doc/index.html;
20+
#echo '<meta http-equiv=refresh content=0;url=rustup/index.html>' > target/doc/index.html;
2121
#sudo pip install ghp-import;
2222
#ghp-import -n target/doc;
2323
#git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages;

‎src/download/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ pub mod hyper_base {
649649
let src = try!(url.to_file_path()
650650
.map_err(|_| Error::from(format!("bogus file url: '{}'", url))));
651651
if !src.is_file() {
652-
// Because some of multirust's logic depends on checking
652+
// Because some of rustup's logic depends on checking
653653
// the error when a downloaded file doesn't exist, make
654654
// the file case return the same error value as the
655655
// network case.

‎src/rustup-cli/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@ fn run_rustup() -> Result<()> {
9494
n.starts_with("rustup-init") => {
9595
// NB: The above check is only for the prefix of the file
9696
// name. Browsers rename duplicates to
97-
// e.g. multirust-setup(2), and this allows all variations
97+
// e.g. rustup-setup(2), and this allows all variations
9898
// to work.
9999
setup_mode::main()
100100
}
101101
Some(n) if n.starts_with("rustup-gc-") => {
102102
// This is the final uninstallation stage on windows where
103-
// multirust deletes its own exe
103+
// rustup deletes its own exe
104104
self_update::complete_windows_uninstall()
105105
}
106106
Some(n) if n.starts_with("multirust-") => {

‎src/rustup-cli/self_update.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ pub fn uninstall(no_prompt: bool) -> Result<()> {
675675
try!(utils::delete_legacy_multirust_symlink());
676676

677677
// Delete RUSTUP_HOME
678-
let ref rustup_dir = try!(utils::multirust_home());
678+
let ref rustup_dir = try!(utils::rustup_home());
679679
if rustup_dir.exists() {
680680
try!(utils::remove_dir("rustup_home", rustup_dir, &|_| {}));
681681
}

‎src/rustup-dist/tests/dist.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ pub fn create_mock_channel(channel: &str, date: &str,
243243

244244
#[test]
245245
fn mock_dist_server_smoke_test() {
246-
let tempdir = TempDir::new("multirust").unwrap();
246+
let tempdir = TempDir::new("rustup").unwrap();
247247
let path = tempdir.path();
248248

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

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

315-
let prefix_tempdir = TempDir::new("multirust").unwrap();
315+
let prefix_tempdir = TempDir::new("rustup").unwrap();
316316

317-
let work_tempdir = TempDir::new("multirust").unwrap();
317+
let work_tempdir = TempDir::new("rustup").unwrap();
318318
let ref temp_cfg = temp::Cfg::new(work_tempdir.path().to_owned(),
319319
DEFAULT_DIST_SERVER,
320320
Box::new(|_| ()));

‎src/rustup-dist/tests/install.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use rustup_mock::{MockInstallerBuilder, MockCommand};
2020
// Just testing that the mocks work
2121
#[test]
2222
fn mock_smoke_test() {
23-
let tempdir = TempDir::new("multirust").unwrap();
23+
let tempdir = TempDir::new("rustup").unwrap();
2424

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

5252
#[test]
5353
fn package_contains() {
54-
let tempdir = TempDir::new("multirust").unwrap();
54+
let tempdir = TempDir::new("rustup").unwrap();
5555

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

7474
#[test]
7575
fn package_bad_version() {
76-
let tempdir = TempDir::new("multirust").unwrap();
76+
let tempdir = TempDir::new("rustup").unwrap();
7777

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

9292
#[test]
9393
fn basic_install() {
94-
let pkgdir = TempDir::new("multirust").unwrap();
94+
let pkgdir = TempDir::new("rustup").unwrap();
9595

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

107107
mock.build(pkgdir.path());
108108

109-
let instdir = TempDir::new("multirust").unwrap();
109+
let instdir = TempDir::new("rustup").unwrap();
110110
let prefix = InstallPrefix::from(instdir.path().to_owned());
111111

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

132132
#[test]
133133
fn multiple_component_install() {
134-
let pkgdir = TempDir::new("multirust").unwrap();
134+
let pkgdir = TempDir::new("rustup").unwrap();
135135

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

145145
mock.build(pkgdir.path());
146146

147-
let instdir = TempDir::new("multirust").unwrap();
147+
let instdir = TempDir::new("rustup").unwrap();
148148
let prefix = InstallPrefix::from(instdir.path().to_owned());
149149

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

170170
#[test]
171171
fn uninstall() {
172-
let pkgdir = TempDir::new("multirust").unwrap();
172+
let pkgdir = TempDir::new("rustup").unwrap();
173173

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

188188
mock.build(pkgdir.path());
189189

190-
let instdir = TempDir::new("multirust").unwrap();
190+
let instdir = TempDir::new("rustup").unwrap();
191191
let prefix = InstallPrefix::from(instdir.path().to_owned());
192192

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

230230
#[test]
231231
fn component_bad_version() {
232-
let pkgdir = TempDir::new("multirust").unwrap();
232+
let pkgdir = TempDir::new("rustup").unwrap();
233233

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

240240
mock.build(pkgdir.path());
241241

242-
let instdir = TempDir::new("multirust").unwrap();
242+
let instdir = TempDir::new("rustup").unwrap();
243243
let prefix = InstallPrefix::from(instdir.path().to_owned());
244244

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

273-
let pkgdir = TempDir::new("multirust").unwrap();
273+
let pkgdir = TempDir::new("rustup").unwrap();
274274

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

289289
mock.build(pkgdir.path());
290290

291-
let instdir = TempDir::new("multirust").unwrap();
291+
let instdir = TempDir::new("rustup").unwrap();
292292
let prefix = InstallPrefix::from(instdir.path().to_owned());
293293

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

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

335335
mock.build(pkgdir.path());
336336

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

342-
let tmpdir = TempDir::new("multirust").unwrap();
342+
let tmpdir = TempDir::new("rustup").unwrap();
343343
let tmpcfg = temp::Cfg::new(tmpdir.path().to_owned(), DEFAULT_DIST_SERVER, Box::new(|_| ()));
344344
let notify = |_: Notification| ();
345345
let tx = Transaction::new(prefix.clone(), &tmpcfg, &notify);

0 commit comments

Comments
 (0)
⚡