Skip to content

Update to rust master #1397

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

Merged
merged 10 commits into from
Mar 9, 2015
Merged

Update to rust master #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a1faa7c
Updated to rust nightly 2015-03-04
Victor-Savu Mar 5, 2015
a14fafa
removed [feature(env)] attributes
Victor-Savu Mar 5, 2015
f74b404
fixed feature attribute
Victor-Savu Mar 5, 2015
2fac34a
Updated versions for rustc, curl, docopt and regex.
Victor-Savu Mar 6, 2015
50041a0
Merge branch 'master' of https://github.com/rust-lang/cargo
Victor-Savu Mar 6, 2015
035c1fe
Reverting to rustc nightly 2015-03-04 because threadpool build fails …
Victor-Savu Mar 6, 2015
d638fb2
Merge branch 'master' of https://github.com/Victor-Savu/cargo into up…
alexcrichton Mar 9, 2015
97a2f27
Update to rust master
alexcrichton Mar 9, 2015
cbed191
Reduce usage of unstable features
alexcrichton Mar 9, 2015
22e7ede
Fix all tests from the update to rust master
alexcrichton Mar 9, 2015
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
110 changes: 60 additions & 50 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 28 additions & 35 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,34 @@ name = "cargo"
path = "src/cargo/lib.rs"

[dependencies]
toml = "0.1"
semver = "0.1"
curl = "0.2"
tar = "0.2"
flate2 = "0.2"
git2 = "0.2"
git2-curl = "0.2"
glob = "0.2"
time = "0.1"
log = "0.2"
env_logger = "0.2"
docopt = "0.6"
url = "0.2"
rustc-serialize = "0.3"
term = "0.1"
regex = "0.1"
threadpool = "0.1"
libc = "0.1"

[target.i686-pc-windows-gnu.dependencies]
winapi = "0.1"
advapi32-sys = "*"

[target.x86_64-pc-windows-gnu.dependencies]
winapi = "0.1"
advapi32-sys = "*"

[dev-dependencies.hamcrest]
git = "https://github.com/carllerche/hamcrest-rust.git"

[dependencies.registry]
path = "src/registry"
toml = "0.1.18"
semver = "0.1.16"
curl = "0.2.2"
tar = "0.2.3"
flate2 = "0.2.0"
git2 = "0.2.1"
git2-curl = "0.2.1"
glob = "0.2.2"
time = "0.1.19"
log = "0.2.5"
env_logger = "0.2.2"
docopt = "0.6.45"
url = "0.2.23"
rustc-serialize = "0.3.1"
term = "0.1.13"
regex = "0.1.18"
threadpool = "0.1.1"
libc = "0.1.2"
registry = { path = "src/registry" }

[target.i686-pc-windows-gnu]
dependencies = { winapi = "0.1", advapi32-sys = "*" }
[target.x86_64-pc-windows-gnu]
dependencies = { winapi = "0.1", advapi32-sys = "*" }

[dev-dependencies]
tempdir = "0.3"
hamcrest = { git = "https://github.com/carllerche/hamcrest-rust.git" }

[[bin]]
name = "cargo"
Expand All @@ -50,9 +46,6 @@ doc = false

[[test]]
name = "tests"
[[bench]]
name = "tests"
path = "tests/tests.rs"

[[test]]
name = "resolve"
6 changes: 3 additions & 3 deletions src/bin/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
config.shell().set_verbose(options.flag_verbose);

let ops = ops::TestOptions {
name: options.flag_bench.as_ref().map(|s| s.as_slice()),
name: options.flag_bench.as_ref().map(|s| &s[..]),
no_run: options.flag_no_run,
compile_opts: ops::CompileOptions {
env: "bench",
config: config,
jobs: options.flag_jobs,
target: options.flag_target.as_ref().map(|s| s.as_slice()),
target: options.flag_target.as_ref().map(|s| &s[..]),
dev_deps: true,
features: &options.flag_features,
no_default_features: options.flag_no_default_features,
spec: options.flag_package.as_ref().map(|s| s.as_slice()),
spec: options.flag_package.as_ref().map(|s| &s[..]),
lib_only: false,
exec_engine: None,
},
Expand Down
4 changes: 2 additions & 2 deletions src/bin/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
env: env,
config: config,
jobs: options.flag_jobs,
target: options.flag_target.as_ref().map(|t| t.as_slice()),
target: options.flag_target.as_ref().map(|t| &t[..]),
dev_deps: false,
features: &options.flag_features,
no_default_features: options.flag_no_default_features,
spec: options.flag_package.as_ref().map(|s| s.as_slice()),
spec: options.flag_package.as_ref().map(|s| &s[..]),
lib_only: options.flag_lib,
exec_engine: None,
};
Expand Down
Loading