about summary refs log tree commit diff
path: root/src/test/run-make
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-24 14:56:00 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-24 14:56:00 -0700
commit91b633aa038008fdbee658a10182afdd794d2aa6 (patch)
tree9aace54d26dfdc7e66a1ec1b273f00770b801ad3 /src/test/run-make
parent5ed8733ea39927d267f4e99c16d3fdca671d8315 (diff)
parenteb2f1d925ffdb79d45c7b74cef549e54533c3951 (diff)
downloadrust-91b633aa038008fdbee658a10182afdd794d2aa6.tar.gz
rust-91b633aa038008fdbee658a10182afdd794d2aa6.zip
rollup merge of #23546: alexcrichton/hyphens
The compiler will now issue a warning for crates that have syntax of the form
`extern crate "foo" as bar`, but it will still continue to accept this syntax.
Additionally, the string `foo-bar` will match the crate name `foo_bar` to assist
in the transition period as well.

This patch will land hopefully in tandem with a Cargo patch that will start
translating all crate names to have underscores instead of hyphens.

cc #23533
Diffstat (limited to 'src/test/run-make')
-rw-r--r--src/test/run-make/weird-output-filenames/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-make/weird-output-filenames/Makefile b/src/test/run-make/weird-output-filenames/Makefile
index 3d57a2263e1..2172ed888b1 100644
--- a/src/test/run-make/weird-output-filenames/Makefile
+++ b/src/test/run-make/weird-output-filenames/Makefile
@@ -12,4 +12,4 @@ all:
 		| grep "invalid character.*in crate name:"
 	cp foo.rs $(TMPDIR)/-foo.rs
 	$(RUSTC) $(TMPDIR)/-foo.rs 2>&1 \
-		| grep "crate name cannot start with a hyphen:"
+		| grep "soon cannot contain hyphens:"