Skip to content

Commit ec56e66

Browse files
committed
Merge pull request #312 from brson/no-multirust
Convert from multirust to rustup
2 parents 2763d84 + c4417ff commit ec56e66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+498
-1137
lines changed

Cargo.lock

Lines changed: 55 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22

3-
name = "multirust-rs"
3+
name = "rustup"
44
version = "0.1.6"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "multirust in rust - manage multiple rust installations with ease"
@@ -16,8 +16,8 @@ keywords = ["multirust", "install", "proxy"]
1616
license = "MIT OR Apache-2.0"
1717

1818
[dependencies]
19-
multirust-dist = { path = "src/multirust-dist" }
20-
multirust-utils = { path = "src/multirust-utils" }
19+
rustup-dist = { path = "src/rustup-dist" }
20+
rustup-utils = { path = "src/rustup-utils" }
2121
clap = "2.2.4"
2222
regex = "0.1.41"
2323
openssl = "0.7.2"
@@ -55,15 +55,15 @@ user32-sys = "0.1.2"
5555
kernel32-sys = "0.2.1"
5656

5757
[dev-dependencies]
58-
multirust-mock = { path = "src/multirust-mock" }
58+
rustup-mock = { path = "src/rustup-mock" }
5959
lazy_static = "0.1.15"
6060

6161
[lib]
62-
name = "multirust"
63-
path = "src/multirust/lib.rs"
62+
name = "rustup"
63+
path = "src/rustup/lib.rs"
6464
test = false # no unit tests
6565

6666
[[bin]]
6767
name = "rustup-setup"
68-
path = "src/multirust-cli/main.rs"
68+
path = "src/rustup-cli/main.rs"
6969
test = false # no unit tests

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ build: false
4343

4444
test_script:
4545
- cargo build --release
46-
- cargo test --release -p multirust-dist
46+
- cargo test --release -p rustup-dist
4747
- cargo test --release
4848

4949
notifications:

ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ set -ex
55
cargo build --release --target $TARGET
66

77
if [ -z "$SKIP_TESTS" ]; then
8-
cargo test --release -p multirust-dist --target $TARGET
8+
cargo test --release -p rustup-dist --target $TARGET
99
cargo test --release --target $TARGET
1010
fi
File renamed without changes.

src/multirust-cli/common.rs renamed to src/rustup-cli/common.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! Just a dumping ground for cli stuff
22
3-
use multirust::{Cfg, Result, Notification, Toolchain, Error, UpdateStatus};
4-
use multirust_utils::{self, utils};
5-
use multirust_utils::notify::NotificationLevel;
3+
use rustup::{Cfg, Result, Notification, Toolchain, Error, UpdateStatus};
4+
use rustup_utils::{self, utils};
5+
use rustup_utils::notify::NotificationLevel;
66
use self_update;
77
use std::ffi::OsStr;
88
use std::io::{Write, Read, BufRead};
@@ -83,9 +83,9 @@ pub fn run_inner<S: AsRef<OsStr>>(mut command: Command,
8383
process::exit(code);
8484
}
8585
Err(e) => {
86-
Err(multirust_utils::Error::RunningCommand {
86+
Err(rustup_utils::Error::RunningCommand {
8787
name: args[0].as_ref().to_owned(),
88-
error: multirust_utils::raw::CommandError::Io(e),
88+
error: rustup_utils::raw::CommandError::Io(e),
8989
}.into())
9090
}
9191
}

src/multirust-cli/download_tracker.rs renamed to src/rustup-cli/download_tracker.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ use std::collections::VecDeque;
22
use std::fmt;
33
use term;
44
use time::precise_time_s;
5-
use multirust::Notification;
6-
use multirust_dist::Notification as In;
7-
use multirust_utils::Notification as Un;
5+
use rustup::Notification;
6+
use rustup_dist::Notification as In;
7+
use rustup_utils::Notification as Un;
88
use tty;
99

1010
/// Keep track of this many past download amounts
File renamed without changes.
File renamed without changes.

src/multirust-cli/main.rs renamed to src/rustup-cli/main.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
extern crate multirust_dist;
1+
extern crate rustup_dist;
22
#[macro_use]
3-
extern crate multirust_utils;
3+
extern crate rustup_utils;
44

55
#[macro_use]
66
extern crate clap;
77
extern crate regex;
88
extern crate hyper;
99
#[macro_use]
10-
extern crate multirust;
10+
extern crate rustup;
1111
extern crate term;
1212
extern crate openssl;
1313
extern crate itertools;
@@ -42,7 +42,7 @@ mod term2;
4242

4343
use std::env;
4444
use std::path::PathBuf;
45-
use multirust::{Error, Result};
45+
use rustup::{Error, Result};
4646

4747
fn main() {
4848
if let Err(e) = run_multirust() {

src/multirust-cli/multirust_mode.rs renamed to src/rustup-cli/multirust_mode.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use cli;
33
use common::{self, confirm, set_globals, run_inner,
44
show_channel_update, show_tool_versions,
55
update_all_channels};
6-
use multirust::*;
7-
use multirust_dist::manifest::Component;
8-
use multirust_dist::dist::TargetTriple;
6+
use rustup::*;
7+
use rustup_dist::manifest::Component;
8+
use rustup_dist::dist::TargetTriple;
99
use self_update;
1010
use std::env;
1111
use std::path::{Path, PathBuf};

src/multirust-cli/proxy_mode.rs renamed to src/rustup-cli/proxy_mode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use common::{run_inner, set_globals};
2-
use multirust::{Cfg, Result, Error};
3-
use multirust_utils::utils;
2+
use rustup::{Cfg, Result, Error};
3+
use rustup_utils::utils;
44
use std::env;
55
use std::path::PathBuf;
66
use job;

src/multirust-cli/rustup_mode.rs renamed to src/rustup-cli/rustup_mode.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use clap::{App, Arg, AppSettings, SubCommand, ArgMatches};
22
use common;
3-
use multirust::{Result, Cfg, Error, Toolchain};
4-
use multirust_dist::manifest::Component;
5-
use multirust_dist::dist::TargetTriple;
6-
use multirust_utils::utils;
3+
use rustup::{Result, Cfg, Error, Toolchain};
4+
use rustup_dist::manifest::Component;
5+
use rustup_dist::dist::TargetTriple;
6+
use rustup_utils::utils;
77
use self_update;
88
use std::path::Path;
99

src/multirust-cli/self_update.rs renamed to src/rustup-cli/self_update.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
3333
use common::{self, confirm};
3434
use itertools::Itertools;
35-
use multirust::{Error, Result, NotifyHandler};
36-
use multirust_dist::dist;
37-
use multirust_dist;
38-
use multirust_utils::utils;
35+
use rustup::{Error, Result, NotifyHandler};
36+
use rustup_dist::dist;
37+
use rustup_dist;
38+
use rustup_utils::utils;
3939
use openssl::crypto::hash::{Type, Hasher};
4040
use std::env;
4141
use std::env::consts::EXE_SUFFIX;
@@ -259,7 +259,7 @@ fn cleanup_legacy() -> Result<()> {
259259

260260
#[cfg(windows)]
261261
fn legacy_multirust_home_dir() -> Result<PathBuf> {
262-
use multirust_utils::raw::windows::{
262+
use rustup_utils::raw::windows::{
263263
get_special_folder, FOLDERID_LocalAppData
264264
};
265265

@@ -500,7 +500,7 @@ fn delete_multirust_and_cargo_home() -> Result<()> {
500500
/// Run by multirust-gc-$num.exe to delete CARGO_HOME
501501
#[cfg(windows)]
502502
pub fn complete_windows_uninstall() -> Result<()> {
503-
use multirust::NotifyHandler;
503+
use rustup::NotifyHandler;
504504
use std::ffi::OsStr;
505505
use std::process::Stdio;
506506

@@ -939,7 +939,7 @@ pub fn prepare_update() -> Result<Option<PathBuf>> {
939939

940940
// Check that hash is correct
941941
if latest_hash != download_hash {
942-
return Err(Error::Install(multirust_dist::Error::ChecksumFailed {
942+
return Err(Error::Install(rustup_dist::Error::ChecksumFailed {
943943
url: url,
944944
expected: latest_hash,
945945
calculated: download_hash,

src/multirust-cli/setup_mode.rs renamed to src/rustup-cli/setup_mode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::env;
22
use self_update;
3-
use multirust::Result;
3+
use rustup::Result;
44
use clap::{App, Arg};
55
use common;
66

File renamed without changes.
File renamed without changes.

src/multirust-dist/Cargo.toml renamed to src/rustup-dist/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22

3-
name = "multirust-dist"
3+
name = "rustup-dist"
44
version = "0.1.6"
55
authors = [ "Diggory Blake <[email protected]>" ]
66
description = "Installation from a Rust distribution server"
@@ -23,8 +23,8 @@ flate2 = "0.2.9"
2323
tempdir = "0.3.4"
2424
walkdir = "0.1.5"
2525
toml = "0.1.27"
26-
multirust-mock = { path = "../multirust-mock" }
27-
multirust-utils = { path = "../multirust-utils" }
26+
rustup-mock = { path = "../rustup-mock" }
27+
rustup-utils = { path = "../rustup-utils" }
2828

2929
[lib]
30-
name = "multirust_dist"
30+
name = "rustup_dist"
File renamed without changes.

src/multirust-dist/src/component/components.rs renamed to src/rustup-dist/src/component/components.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// `Components` and `DirectoryPackage` are the two sides of the
33
/// installation / uninstallation process.
44
5-
use multirust_utils::{self, utils};
5+
use rustup_utils::{self, utils};
66
use prefix::InstallPrefix;
77
use errors::*;
88

@@ -118,7 +118,7 @@ impl<'a> ComponentBuilder<'a> {
118118
// FIXME: This writes relative paths to the component manifest,
119119
// but rust-installer writes absolute paths.
120120
try!(writeln!(file, "{}", part.encode()).map_err(|e| {
121-
multirust_utils::Error::WritingFile {
121+
rustup_utils::Error::WritingFile {
122122
name: "component",
123123
path: abs_path.clone(),
124124
error: e,

src/multirust-dist/src/component/package.rs renamed to src/rustup-dist/src/component/package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use component::components::*;
99
use component::transaction::*;
1010

1111
use errors::*;
12-
use multirust_utils::utils;
12+
use rustup_utils::utils;
1313
use temp;
1414

1515
use std::path::{Path, PathBuf};

0 commit comments

Comments
 (0)