mirror of
https://github.com/rust-lang/cargo.git
synced 2025-09-28 11:20:36 +00:00
auto merge of #129 : riccieri/cargo/no_more_crate_id, r=alexcrichton
This solves warnings about the use of the deprecated `#![crate_id]` attribute, as well as the deprecated `--crate-file-name` command line option. See rust-lang/rust@c3ef04be55 for details. Note that this won't compile on the current master without #128 (or equivalent). I can rebase after a fix lands
This commit is contained in:
commit
ae1efeedf5
4
Makefile
4
Makefile
@ -23,8 +23,8 @@ BINS = cargo \
|
||||
SRC = $(shell find src -name '*.rs' -not -path 'src/bin*')
|
||||
|
||||
DEPS = -L libs/hammer.rs/target -L libs/toml-rs/build
|
||||
TOML = libs/toml-rs/build/$(shell $(RUSTC) --crate-file-name libs/toml-rs/src/toml.rs)
|
||||
HAMMER = libs/hammer.rs/target/$(shell $(RUSTC) --crate-type=lib --crate-file-name libs/hammer.rs/src/hammer.rs)
|
||||
TOML = libs/toml-rs/build/$(shell $(RUSTC) --print-file-name libs/toml-rs/src/toml.rs)
|
||||
HAMMER = libs/hammer.rs/target/$(shell $(RUSTC) --crate-type=lib --print-file-name libs/hammer.rs/src/hammer.rs)
|
||||
HAMCREST = libs/hamcrest-rust/target/libhamcrest.timestamp
|
||||
LIBCARGO = target/libcargo.timestamp
|
||||
BIN_TARGETS = $(patsubst %,target/%,$(BINS))
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-build"]
|
||||
#![crate_name="cargo-build"]
|
||||
#![feature(phase)]
|
||||
|
||||
extern crate cargo;
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-git-checkout"]
|
||||
#![crate_name="cargo-git-checkout"]
|
||||
#![feature(phase)]
|
||||
|
||||
extern crate cargo;
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-read-manifest"]
|
||||
#![crate_name="cargo-read-manifest"]
|
||||
#![feature(phase)]
|
||||
|
||||
extern crate cargo;
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-rustc"]
|
||||
#![crate_name="cargo-rustc"]
|
||||
|
||||
extern crate cargo;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-test"]
|
||||
#![crate_name="cargo-test"]
|
||||
#![feature(phase)]
|
||||
|
||||
#[phase(plugin, link)]
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo-verify-project"]
|
||||
#![crate_name="cargo-verify-project"]
|
||||
|
||||
extern crate toml;
|
||||
extern crate getopts;
|
||||
|
@ -1,4 +1,4 @@
|
||||
#![crate_id="cargo"]
|
||||
#![crate_name="cargo"]
|
||||
#![crate_type="rlib"]
|
||||
|
||||
#![feature(macro_rules, phase)]
|
||||
|
Loading…
x
Reference in New Issue
Block a user