From 4204adddac2253e31168426b794db15ef0ef457d Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Fri, 13 Jun 2014 23:02:53 -0700
Subject: [PATCH] librustc: Remove the ability for `extern crate` to specify
 crate IDs.

Issue #14468.

After a snapshot, it will be possible to remove the `extern crate foo =
STRING` syntax in favor of the new `extern crate foo = IDENT`.

This will break crates that have names that are not valid Rust
identifiers (in particular, those that contain hyphens). Change such
crates to have names that correspond to valid Rust identifiers. (Most
commonly, this will involve changing hyphens to underscores.)

[breaking-change]
---
 src/doc/rust.md                               |  8 ++---
 src/librustc/front/std_inject.rs              | 18 +++-------
 src/librustc/metadata/creader.rs              |  5 +--
 src/librustc/middle/save/mod.rs               |  2 +-
 src/librustdoc/clean/mod.rs                   |  4 ++-
 src/libsyntax/ast.rs                          |  9 +++--
 src/libsyntax/parse/parser.rs                 | 14 ++++++--
 src/libsyntax/print/pprust.rs                 |  4 +--
 ...-1.rs => anon_extern_mod_cross_crate_1.rs} |  0
 ...ing-crates-a1.rs => changing_crates_a1.rs} |  0
 ...ing-crates-a2.rs => changing_crates_a2.rs} |  0
 ...nging-crates-b.rs => changing_crates_b.rs} |  0
 ....rs => crate_method_reexport_grrrrrrr2.rs} |  0
 ...{crateresolve1-1.rs => crateresolve1_1.rs} |  0
 ...{crateresolve1-2.rs => crateresolve1_2.rs} |  0
 ...{crateresolve1-3.rs => crateresolve1_3.rs} |  0
 ...{crateresolve2-1.rs => crateresolve2_1.rs} |  0
 ...{crateresolve2-2.rs => crateresolve2_2.rs} |  0
 ...{crateresolve2-3.rs => crateresolve2_3.rs} |  0
 ...{crateresolve3-1.rs => crateresolve3_1.rs} |  0
 ...{crateresolve3-2.rs => crateresolve3_2.rs} |  0
 ...rateresolve4a-1.rs => crateresolve4a_1.rs} |  0
 ...rateresolve4a-2.rs => crateresolve4a_2.rs} |  0
 ...rateresolve4b-1.rs => crateresolve4b_1.rs} |  6 ++--
 ...rateresolve4b-2.rs => crateresolve4b_2.rs} |  6 ++--
 ...{crateresolve5-1.rs => crateresolve5_1.rs} |  0
 ...{crateresolve5-2.rs => crateresolve5_2.rs} |  0
 src/test/auxiliary/crateresolve7x.rs          |  4 +--
 ...{crateresolve8-1.rs => crateresolve8_1.rs} |  0
 ...lories-1.rs => crateresolve_calories_1.rs} |  0
 ...lories-2.rs => crateresolve_calories_2.rs} |  0
 ...-source.rs => extern_crosscrate_source.rs} |  2 +-
 .../{issue-10028.rs => issue_10028.rs}        |  0
 .../{issue-11224.rs => issue_11224.rs}        |  0
 .../{issue-11225-1.rs => issue_11225_1.rs}    |  0
 .../{issue-11225-2.rs => issue_11225_2.rs}    |  0
 .../{issue-11508.rs => issue_11508.rs}        |  0
 .../{issue-11529.rs => issue_11529.rs}        |  0
 .../{issue-11680.rs => issue_11680.rs}        |  0
 .../{issue-11908-1.rs => issue_11908_1.rs}    |  0
 .../{issue-11908-2.rs => issue_11908_2.rs}    |  0
 ...ue-12133-dylib.rs => issue_12133_dylib.rs} |  0
 ...-12133-dylib2.rs => issue_12133_dylib2.rs} |  4 +--
 ...ssue-12133-rlib.rs => issue_12133_rlib.rs} |  0
 .../{issue-12612-1.rs => issue_12612_1.rs}    |  0
 .../{issue-12612-2.rs => issue_12612_2.rs}    |  0
 .../{issue-13560-1.rs => issue_13560_1.rs}    |  0
 .../{issue-13560-2.rs => issue_13560_2.rs}    |  0
 .../{issue-13560-3.rs => issue_13560_3.rs}    |  4 +--
 .../{issue-13620-1.rs => issue_13620_1.rs}    |  0
 .../{issue-13620-2.rs => issue_13620_2.rs}    |  2 +-
 .../{issue-13872-1.rs => issue_13872_1.rs}    |  0
 .../{issue-13872-2.rs => issue_13872_2.rs}    |  2 +-
 .../{issue-13872-3.rs => issue_13872_3.rs}    |  2 +-
 .../{issue-14421.rs => issue_14421.rs}        |  0
 .../{issue-14422.rs => issue_14422.rs}        |  0
 .../{issue-2380.rs => issue_2380.rs}          |  0
 .../{issue-2414-a.rs => issue_2414_a.rs}      |  0
 .../{issue-2414-b.rs => issue_2414_b.rs}      |  0
 .../{issue-2526.rs => issue_2526.rs}          |  0
 .../{issue-2631-a.rs => issue_2631_a.rs}      |  0
 .../{issue-3012-1.rs => issue_3012_1.rs}      |  0
 .../{issue-4208-cc.rs => issue_4208_cc.rs}    |  0
 .../{issue-4545.rs => issue_4545.rs}          |  0
 .../{issue-5518.rs => issue_5518.rs}          |  0
 .../{issue-5521.rs => issue_5521.rs}          |  0
 .../{issue-7178.rs => issue_7178.rs}          |  0
 .../{issue-7899.rs => issue_7899.rs}          |  0
 .../{issue-8044.rs => issue_8044.rs}          |  0
 .../{issue-8259.rs => issue_8259.rs}          |  0
 .../{issue-9906.rs => issue_9906.rs}          |  2 +-
 .../{issue-9968.rs => issue_9968.rs}          |  0
 ...ang-item-public.rs => lang_item_public.rs} |  0
 ...ge-visibility.rs => linkage_visibility.rs} |  0
 ...v-impl-prim-ty.rs => priv_impl_prim_ty.rs} |  0
 ...t-variant.rs => privacy_struct_variant.rs} |  0
 ...uple-struct.rs => privacy_tuple_struct.rs} |  0
 ...-link.rs => reexport_should_still_link.rs} |  0
 ...-aux.rs => static_function_pointer_aux.rs} |  2 +-
 ...thods-crate.rs => static_methods_crate.rs} |  0
 ...eld-privacy.rs => struct_field_privacy.rs} |  0
 .../{svh-a-base.rs => svh_a_base.rs}          |  0
 ...vh-a-change-lit.rs => svh_a_change_lit.rs} |  0
 ...cfg.rs => svh_a_change_significant_cfg.rs} |  0
 ...t-bound.rs => svh_a_change_trait_bound.rs} |  0
 ...e-type-arg.rs => svh_a_change_type_arg.rs} |  0
 ...e-type-ret.rs => svh_a_change_type_ret.rs} |  0
 ...-static.rs => svh_a_change_type_static.rs} |  0
 .../{svh-a-comment.rs => svh_a_comment.rs}    |  0
 .../auxiliary/{svh-a-doc.rs => svh_a_doc.rs}  |  0
 .../{svh-a-macro.rs => svh_a_macro.rs}        |  0
 ...{svh-a-no-change.rs => svh_a_no_change.rs} |  0
 ...edundant-cfg.rs => svh_a_redundant_cfg.rs} |  0
 ...vh-a-whitespace.rs => svh_a_whitespace.rs} |  0
 src/test/auxiliary/{svh-b.rs => svh_b.rs}     |  0
 .../{svh-uta-base.rs => svh_uta_base.rs}      |  0
 ...e-trait.rs => svh_uta_change_use_trait.rs} |  0
 src/test/auxiliary/{svh-utb.rs => svh_utb.rs} |  0
 ...rs => syntax_extension_with_dll_deps_1.rs} |  0
 ...rs => syntax_extension_with_dll_deps_2.rs} |  2 +-
 .../trait_default_method_xc_aux_2.rs          |  2 +-
 ...ypeid-intrinsic.rs => typeid_intrinsic.rs} |  0
 ...eid-intrinsic2.rs => typeid_intrinsic2.rs} |  0
 ...able-variant.rs => unreachable_variant.rs} |  0
 ...{weak-lang-items.rs => weak_lang_items.rs} |  0
 ...aram.rs => xcrate_trait_lifetime_param.rs} |  0
 src/test/compile-fail/bad-crate-id.rs         |  3 +-
 src/test/compile-fail/changing-crates.rs      |  6 ++--
 src/test/compile-fail/crateresolve1.rs        |  6 ++--
 src/test/compile-fail/crateresolve2.rs        | 24 -------------
 src/test/compile-fail/crateresolve5.rs        | 21 ------------
 src/test/compile-fail/issue-11680.rs          |  4 +--
 src/test/compile-fail/issue-11908-1.rs        |  2 +-
 src/test/compile-fail/issue-11908-2.rs        |  2 +-
 src/test/compile-fail/issue-12612.rs          |  4 +--
 .../compile-fail/privacy-struct-variant.rs    | 10 +++---
 src/test/compile-fail/privacy5.rs             | 22 ++++++------
 src/test/compile-fail/struct-field-privacy.rs |  8 ++---
 src/test/compile-fail/svh-change-lit.rs       |  6 ++--
 .../svh-change-significant-cfg.rs             |  6 ++--
 .../compile-fail/svh-change-trait-bound.rs    |  6 ++--
 src/test/compile-fail/svh-change-type-arg.rs  |  6 ++--
 src/test/compile-fail/svh-change-type-ret.rs  |  6 ++--
 .../compile-fail/svh-change-type-static.rs    |  6 ++--
 src/test/compile-fail/svh-use-trait.rs        |  6 ++--
 src/test/compile-fail/unreachable-variant.rs  |  4 +--
 src/test/compile-fail/use-meta-mismatch.rs    |  2 +-
 src/test/compile-fail/weak-lang-item.rs       |  4 +--
 src/test/pretty/raw-str-nonexpr.rs            |  2 --
 src/test/run-pass-fulldeps/issue-13560.rs     | 10 +++---
 .../syntax-extension-with-dll-deps.rs         |  6 ++--
 .../run-pass/anon-extern-mod-cross-crate-2.rs |  2 +-
 .../crate-method-reexport-grrrrrrr.rs         |  2 +-
 src/test/run-pass/crateresolve1.rs            | 19 -----------
 src/test/run-pass/crateresolve2.rs            | 34 -------------------
 src/test/run-pass/crateresolve3.rs            | 30 ----------------
 src/test/run-pass/crateresolve4.rs            | 29 ----------------
 src/test/run-pass/crateresolve5.rs            | 23 -------------
 src/test/run-pass/crateresolve8.rs            | 20 -----------
 src/test/run-pass/duplicated-external-mods.rs |  4 +--
 src/test/run-pass/extern-crosscrate.rs        |  4 +--
 src/test/run-pass/extern-foreign-crate.rs     |  2 +-
 src/test/run-pass/issue-10028.rs              |  4 +--
 src/test/run-pass/issue-11224.rs              |  4 +--
 src/test/run-pass/issue-11225-1.rs            |  4 +--
 src/test/run-pass/issue-11225-2.rs            |  4 +--
 src/test/run-pass/issue-11508.rs              |  4 +--
 src/test/run-pass/issue-11529.rs              |  4 +--
 src/test/run-pass/issue-12133-1.rs            |  8 ++---
 src/test/run-pass/issue-12133-2.rs            |  8 ++---
 src/test/run-pass/issue-12133-3.rs            |  8 ++---
 src/test/run-pass/issue-12612.rs              |  8 ++---
 src/test/run-pass/issue-13620.rs              |  6 ++--
 src/test/run-pass/issue-13872.rs              |  8 ++---
 src/test/run-pass/issue-14421.rs              |  4 +--
 src/test/run-pass/issue-14422.rs              |  4 +--
 src/test/run-pass/issue-2380-b.rs             |  2 +-
 src/test/run-pass/issue-2414-c.rs             |  4 +--
 src/test/run-pass/issue-2526-a.rs             |  2 +-
 src/test/run-pass/issue-2631-b.rs             |  2 +-
 src/test/run-pass/issue-3012-2.rs             |  2 +-
 src/test/run-pass/issue-4208.rs               |  2 +-
 src/test/run-pass/issue-4545.rs               |  4 +--
 src/test/run-pass/issue-5518.rs               |  4 +--
 src/test/run-pass/issue-5521.rs               |  4 +--
 src/test/run-pass/issue-7178.rs               |  4 +--
 src/test/run-pass/issue-7899.rs               |  4 +--
 src/test/run-pass/issue-8044.rs               |  4 +--
 src/test/run-pass/issue-8259.rs               |  4 +--
 src/test/run-pass/issue-9906.rs               |  4 +--
 src/test/run-pass/issue-9968.rs               |  4 +--
 src/test/run-pass/lang-item-public.rs         |  4 +--
 src/test/run-pass/linkage-visibility.rs       |  4 +--
 src/test/run-pass/linkage1.rs                 |  2 +-
 src/test/run-pass/priv-impl-prim-ty.rs        |  4 +--
 .../run-pass/reexport-should-still-link.rs    |  4 +--
 src/test/run-pass/static-fn-inline-xc.rs      |  2 +-
 src/test/run-pass/static-fn-trait-xc.rs       |  2 +-
 .../run-pass/static-function-pointer-xc.rs    |  4 +--
 src/test/run-pass/static-method-xcrate.rs     |  2 +-
 src/test/run-pass/svh-add-comment.rs          |  6 ++--
 src/test/run-pass/svh-add-doc.rs              |  6 ++--
 src/test/run-pass/svh-add-macro.rs            |  6 ++--
 src/test/run-pass/svh-add-nothing.rs          |  6 ++--
 src/test/run-pass/svh-add-redundant-cfg.rs    |  6 ++--
 src/test/run-pass/svh-add-whitespace.rs       |  6 ++--
 .../run-pass/trait-default-method-xc-2.rs     |  4 +--
 src/test/run-pass/trait-default-method-xc.rs  |  2 +-
 .../run-pass/trait-inheritance-auto-xc-2.rs   |  2 +-
 .../run-pass/trait-inheritance-auto-xc.rs     |  2 +-
 .../trait-inheritance-cross-trait-call-xc.rs  |  2 +-
 src/test/run-pass/typeid-intrinsic.rs         |  8 ++---
 src/test/run-pass/use-crate-name-alias.rs     |  2 +-
 src/test/run-pass/use.rs                      |  4 +--
 src/test/run-pass/weak-lang-item.rs           |  4 +--
 .../run-pass/xcrate-address-insignificant.rs  |  2 +-
 .../run-pass/xcrate-trait-lifetime-param.rs   |  4 +--
 197 files changed, 240 insertions(+), 443 deletions(-)
 rename src/test/auxiliary/{anon-extern-mod-cross-crate-1.rs => anon_extern_mod_cross_crate_1.rs} (100%)
 rename src/test/auxiliary/{changing-crates-a1.rs => changing_crates_a1.rs} (100%)
 rename src/test/auxiliary/{changing-crates-a2.rs => changing_crates_a2.rs} (100%)
 rename src/test/auxiliary/{changing-crates-b.rs => changing_crates_b.rs} (100%)
 rename src/test/auxiliary/{crate-method-reexport-grrrrrrr2.rs => crate_method_reexport_grrrrrrr2.rs} (100%)
 rename src/test/auxiliary/{crateresolve1-1.rs => crateresolve1_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve1-2.rs => crateresolve1_2.rs} (100%)
 rename src/test/auxiliary/{crateresolve1-3.rs => crateresolve1_3.rs} (100%)
 rename src/test/auxiliary/{crateresolve2-1.rs => crateresolve2_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve2-2.rs => crateresolve2_2.rs} (100%)
 rename src/test/auxiliary/{crateresolve2-3.rs => crateresolve2_3.rs} (100%)
 rename src/test/auxiliary/{crateresolve3-1.rs => crateresolve3_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve3-2.rs => crateresolve3_2.rs} (100%)
 rename src/test/auxiliary/{crateresolve4a-1.rs => crateresolve4a_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve4a-2.rs => crateresolve4a_2.rs} (100%)
 rename src/test/auxiliary/{crateresolve4b-1.rs => crateresolve4b_1.rs} (82%)
 rename src/test/auxiliary/{crateresolve4b-2.rs => crateresolve4b_2.rs} (82%)
 rename src/test/auxiliary/{crateresolve5-1.rs => crateresolve5_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve5-2.rs => crateresolve5_2.rs} (100%)
 rename src/test/auxiliary/{crateresolve8-1.rs => crateresolve8_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve_calories-1.rs => crateresolve_calories_1.rs} (100%)
 rename src/test/auxiliary/{crateresolve_calories-2.rs => crateresolve_calories_2.rs} (100%)
 rename src/test/auxiliary/{extern-crosscrate-source.rs => extern_crosscrate_source.rs} (96%)
 rename src/test/auxiliary/{issue-10028.rs => issue_10028.rs} (100%)
 rename src/test/auxiliary/{issue-11224.rs => issue_11224.rs} (100%)
 rename src/test/auxiliary/{issue-11225-1.rs => issue_11225_1.rs} (100%)
 rename src/test/auxiliary/{issue-11225-2.rs => issue_11225_2.rs} (100%)
 rename src/test/auxiliary/{issue-11508.rs => issue_11508.rs} (100%)
 rename src/test/auxiliary/{issue-11529.rs => issue_11529.rs} (100%)
 rename src/test/auxiliary/{issue-11680.rs => issue_11680.rs} (100%)
 rename src/test/auxiliary/{issue-11908-1.rs => issue_11908_1.rs} (100%)
 rename src/test/auxiliary/{issue-11908-2.rs => issue_11908_2.rs} (100%)
 rename src/test/auxiliary/{issue-12133-dylib.rs => issue_12133_dylib.rs} (100%)
 rename src/test/auxiliary/{issue-12133-dylib2.rs => issue_12133_dylib2.rs} (87%)
 rename src/test/auxiliary/{issue-12133-rlib.rs => issue_12133_rlib.rs} (100%)
 rename src/test/auxiliary/{issue-12612-1.rs => issue_12612_1.rs} (100%)
 rename src/test/auxiliary/{issue-12612-2.rs => issue_12612_2.rs} (100%)
 rename src/test/auxiliary/{issue-13560-1.rs => issue_13560_1.rs} (100%)
 rename src/test/auxiliary/{issue-13560-2.rs => issue_13560_2.rs} (100%)
 rename src/test/auxiliary/{issue-13560-3.rs => issue_13560_3.rs} (82%)
 rename src/test/auxiliary/{issue-13620-1.rs => issue_13620_1.rs} (100%)
 rename src/test/auxiliary/{issue-13620-2.rs => issue_13620_2.rs} (92%)
 rename src/test/auxiliary/{issue-13872-1.rs => issue_13872_1.rs} (100%)
 rename src/test/auxiliary/{issue-13872-2.rs => issue_13872_2.rs} (93%)
 rename src/test/auxiliary/{issue-13872-3.rs => issue_13872_3.rs} (93%)
 rename src/test/auxiliary/{issue-14421.rs => issue_14421.rs} (100%)
 rename src/test/auxiliary/{issue-14422.rs => issue_14422.rs} (100%)
 rename src/test/auxiliary/{issue-2380.rs => issue_2380.rs} (100%)
 rename src/test/auxiliary/{issue-2414-a.rs => issue_2414_a.rs} (100%)
 rename src/test/auxiliary/{issue-2414-b.rs => issue_2414_b.rs} (100%)
 rename src/test/auxiliary/{issue-2526.rs => issue_2526.rs} (100%)
 rename src/test/auxiliary/{issue-2631-a.rs => issue_2631_a.rs} (100%)
 rename src/test/auxiliary/{issue-3012-1.rs => issue_3012_1.rs} (100%)
 rename src/test/auxiliary/{issue-4208-cc.rs => issue_4208_cc.rs} (100%)
 rename src/test/auxiliary/{issue-4545.rs => issue_4545.rs} (100%)
 rename src/test/auxiliary/{issue-5518.rs => issue_5518.rs} (100%)
 rename src/test/auxiliary/{issue-5521.rs => issue_5521.rs} (100%)
 rename src/test/auxiliary/{issue-7178.rs => issue_7178.rs} (100%)
 rename src/test/auxiliary/{issue-7899.rs => issue_7899.rs} (100%)
 rename src/test/auxiliary/{issue-8044.rs => issue_8044.rs} (100%)
 rename src/test/auxiliary/{issue-8259.rs => issue_8259.rs} (100%)
 rename src/test/auxiliary/{issue-9906.rs => issue_9906.rs} (96%)
 rename src/test/auxiliary/{issue-9968.rs => issue_9968.rs} (100%)
 rename src/test/auxiliary/{lang-item-public.rs => lang_item_public.rs} (100%)
 rename src/test/auxiliary/{linkage-visibility.rs => linkage_visibility.rs} (100%)
 rename src/test/auxiliary/{priv-impl-prim-ty.rs => priv_impl_prim_ty.rs} (100%)
 rename src/test/auxiliary/{privacy-struct-variant.rs => privacy_struct_variant.rs} (100%)
 rename src/test/auxiliary/{privacy-tuple-struct.rs => privacy_tuple_struct.rs} (100%)
 rename src/test/auxiliary/{reexport-should-still-link.rs => reexport_should_still_link.rs} (100%)
 rename src/test/auxiliary/{static-function-pointer-aux.rs => static_function_pointer_aux.rs} (93%)
 rename src/test/auxiliary/{static-methods-crate.rs => static_methods_crate.rs} (100%)
 rename src/test/auxiliary/{struct-field-privacy.rs => struct_field_privacy.rs} (100%)
 rename src/test/auxiliary/{svh-a-base.rs => svh_a_base.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-lit.rs => svh_a_change_lit.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-significant-cfg.rs => svh_a_change_significant_cfg.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-trait-bound.rs => svh_a_change_trait_bound.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-type-arg.rs => svh_a_change_type_arg.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-type-ret.rs => svh_a_change_type_ret.rs} (100%)
 rename src/test/auxiliary/{svh-a-change-type-static.rs => svh_a_change_type_static.rs} (100%)
 rename src/test/auxiliary/{svh-a-comment.rs => svh_a_comment.rs} (100%)
 rename src/test/auxiliary/{svh-a-doc.rs => svh_a_doc.rs} (100%)
 rename src/test/auxiliary/{svh-a-macro.rs => svh_a_macro.rs} (100%)
 rename src/test/auxiliary/{svh-a-no-change.rs => svh_a_no_change.rs} (100%)
 rename src/test/auxiliary/{svh-a-redundant-cfg.rs => svh_a_redundant_cfg.rs} (100%)
 rename src/test/auxiliary/{svh-a-whitespace.rs => svh_a_whitespace.rs} (100%)
 rename src/test/auxiliary/{svh-b.rs => svh_b.rs} (100%)
 rename src/test/auxiliary/{svh-uta-base.rs => svh_uta_base.rs} (100%)
 rename src/test/auxiliary/{svh-uta-change-use-trait.rs => svh_uta_change_use_trait.rs} (100%)
 rename src/test/auxiliary/{svh-utb.rs => svh_utb.rs} (100%)
 rename src/test/auxiliary/{syntax-extension-with-dll-deps-1.rs => syntax_extension_with_dll_deps_1.rs} (100%)
 rename src/test/auxiliary/{syntax-extension-with-dll-deps-2.rs => syntax_extension_with_dll_deps_2.rs} (94%)
 rename src/test/auxiliary/{typeid-intrinsic.rs => typeid_intrinsic.rs} (100%)
 rename src/test/auxiliary/{typeid-intrinsic2.rs => typeid_intrinsic2.rs} (100%)
 rename src/test/auxiliary/{unreachable-variant.rs => unreachable_variant.rs} (100%)
 rename src/test/auxiliary/{weak-lang-items.rs => weak_lang_items.rs} (100%)
 rename src/test/auxiliary/{xcrate-trait-lifetime-param.rs => xcrate_trait_lifetime_param.rs} (100%)
 delete mode 100644 src/test/compile-fail/crateresolve2.rs
 delete mode 100644 src/test/compile-fail/crateresolve5.rs
 delete mode 100644 src/test/run-pass/crateresolve1.rs
 delete mode 100644 src/test/run-pass/crateresolve2.rs
 delete mode 100644 src/test/run-pass/crateresolve3.rs
 delete mode 100644 src/test/run-pass/crateresolve4.rs
 delete mode 100644 src/test/run-pass/crateresolve5.rs
 delete mode 100644 src/test/run-pass/crateresolve8.rs

diff --git a/src/doc/rust.md b/src/doc/rust.md
index 8f47e81ba5c8..92a975e17412 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -817,7 +817,7 @@ There are several kinds of view item:
 ##### Extern crate declarations
 
 ~~~~ {.ebnf .gram}
-extern_crate_decl : "extern" "crate" ident [ '(' link_attrs ')' ] ? [ '=' string_lit ] ? ;
+extern_crate_decl : "extern" "crate" ident [ '(' link_attrs ')' ] ? [ '=' ident ] ? ;
 link_attrs : link_attr [ ',' link_attrs ] + ;
 link_attr : ident '=' literal ;
 ~~~~
@@ -839,11 +839,9 @@ Four examples of `extern crate` declarations:
 ~~~~ {.ignore}
 extern crate pcre;
 
-extern crate std; // equivalent to: extern crate std = "std";
+extern crate std; // equivalent to: extern crate std = std;
 
-extern crate ruststd = "std"; // linking to 'std' under another name
-
-extern crate foo = "some/where/rust-foo#foo:1.0"; // a full crate ID for external tools
+extern crate ruststd = std; // linking to 'std' under another name
 ~~~~
 
 ##### Use declarations
diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
index dce14099bb36..dd5a0a4755ad 100644
--- a/src/librustc/front/std_inject.rs
+++ b/src/librustc/front/std_inject.rs
@@ -60,23 +60,15 @@ struct StandardLibraryInjector<'a> {
     sess: &'a Session,
 }
 
-pub fn with_version(krate: &str) -> Option<(InternedString, ast::StrStyle)> {
+// FIXME(pcwalton): Making `Ident`s out of this stuff is pretty bogus. What
+// should we do instead?
+pub fn with_version(krate: &str) -> Option<ast::Ident> {
     match option_env!("CFG_DISABLE_INJECT_STD_VERSION") {
         Some("1") => None,
         #[cfg(stage0)]
-        _ => {
-            Some((token::intern_and_get_ident(format!("{}\\#{}",
-                                                      krate,
-                                                      VERSION).as_slice()),
-                  ast::CookedStr))
-        }
+        _ => Some(token::str_to_ident(krate)),
         #[cfg(not(stage0))]
-        _ => {
-            Some((token::intern_and_get_ident(format!("{}#{}",
-                                                      krate,
-                                                      VERSION).as_slice()),
-                  ast::CookedStr))
-        }
+        _ => Some(token::str_to_ident(krate)),
     }
 }
 
diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs
index 4df21fbc974b..40d3812ffab7 100644
--- a/src/librustc/metadata/creader.rs
+++ b/src/librustc/metadata/creader.rs
@@ -152,8 +152,9 @@ fn extract_crate_info(e: &Env, i: &ast::ViewItem) -> Option<CrateInfo> {
             debug!("resolving extern crate stmt. ident: {:?} path_opt: {:?}",
                    ident, path_opt);
             let crate_id = match *path_opt {
-                Some((ref path_str, _)) => {
-                    let crateid: Option<CrateId> = from_str(path_str.get());
+                Some(ref path_str) => {
+                    let crateid: Option<CrateId> =
+                        from_str(token::get_ident(*path_str).get());
                     match crateid {
                         None => {
                             e.sess.span_err(i.span, "malformed crate id");
diff --git a/src/librustc/middle/save/mod.rs b/src/librustc/middle/save/mod.rs
index 7e26d9c79386..7a36c26e2c92 100644
--- a/src/librustc/middle/save/mod.rs
+++ b/src/librustc/middle/save/mod.rs
@@ -1136,7 +1136,7 @@ impl<'l> Visitor<DxrVisitorEnv> for DxrVisitor<'l> {
             ast::ViewItemExternCrate(ident, ref s, id) => {
                 let name = get_ident(ident).get().to_owned();
                 let s = match *s {
-                    Some((ref s, _)) => s.get().to_owned(),
+                    Some(ref s) => get_ident(*s).get().to_owned(),
                     None => name.to_owned(),
                 };
                 let sub_span = self.span.sub_span_after_keyword(i.span, keywords::Crate);
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 7e68be09f1d5..bfe7d1f1e33b 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -1808,7 +1808,9 @@ impl Clean<ViewItemInner> for ast::ViewItem_ {
             &ast::ViewItemExternCrate(ref i, ref p, ref id) => {
                 let string = match *p {
                     None => None,
-                    Some((ref x, _)) => Some(x.get().to_string()),
+                    Some(ref ident) => {
+                        Some(token::get_ident(*ident).get().to_string())
+                    }
                 };
                 ExternCrate(i.clean(), string, *id)
             }
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index b8e08dab722e..dbd182bff45f 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -974,11 +974,10 @@ pub struct ViewItem {
 
 #[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash)]
 pub enum ViewItem_ {
-    // ident: name used to refer to this crate in the code
-    // optional (InternedString,StrStyle): if present, this is a location
-    // (containing arbitrary characters) from which to fetch the crate sources
-    // For example, extern crate whatever = "github.com/mozilla/rust"
-    ViewItemExternCrate(Ident, Option<(InternedString,StrStyle)>, NodeId),
+    // required Ident: name used to refer to this crate in the code
+    // optional Ident: name from which to fetch the crate sources
+    // For example, extern crate whatever = foo;
+    ViewItemExternCrate(Ident, Option<Ident>, NodeId),
     ViewItemUse(Gc<ViewPath>),
 }
 
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d11d303059fa..d126c2785389 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -4474,7 +4474,7 @@ impl<'a> Parser<'a> {
     /// # Example
     ///
     /// extern crate url;
-    /// extern crate foo = "bar";
+    /// extern crate foo = bar;
     fn parse_item_extern_crate(&mut self,
                                 lo: BytePos,
                                 visibility: Visibility,
@@ -4487,8 +4487,16 @@ impl<'a> Parser<'a> {
                 self.expect_one_of(&[], &[token::EQ, token::SEMI]);
                 let path = if self.token == token::EQ {
                     self.bump();
-                    Some(self.parse_str())
-                } else {None};
+                    if is_ident(&self.token) {
+                        Some(self.parse_ident())
+                    } else {
+                        // NOTE(pcwalton, stage0): Remove after snapshot.
+                        let (string, _) = self.parse_str();
+                        Some(token::str_to_ident(string.get()))
+                    }
+                } else {
+                    None
+                };
 
                 self.expect(&token::SEMI);
                 (path, the_ident)
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 63acdb1a6ca7..79e2fc399310 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -2107,11 +2107,11 @@ impl<'a> State<'a> {
             ast::ViewItemExternCrate(id, ref optional_path, _) => {
                 try!(self.head("extern crate"));
                 try!(self.print_ident(id));
-                for &(ref p, style) in optional_path.iter() {
+                for ident in optional_path.iter() {
                     try!(space(&mut self.s));
                     try!(word(&mut self.s, "="));
                     try!(space(&mut self.s));
-                    try!(self.print_string(p.get(), style));
+                    try!(self.print_ident(*ident));
                 }
             }
 
diff --git a/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/auxiliary/anon_extern_mod_cross_crate_1.rs
similarity index 100%
rename from src/test/auxiliary/anon-extern-mod-cross-crate-1.rs
rename to src/test/auxiliary/anon_extern_mod_cross_crate_1.rs
diff --git a/src/test/auxiliary/changing-crates-a1.rs b/src/test/auxiliary/changing_crates_a1.rs
similarity index 100%
rename from src/test/auxiliary/changing-crates-a1.rs
rename to src/test/auxiliary/changing_crates_a1.rs
diff --git a/src/test/auxiliary/changing-crates-a2.rs b/src/test/auxiliary/changing_crates_a2.rs
similarity index 100%
rename from src/test/auxiliary/changing-crates-a2.rs
rename to src/test/auxiliary/changing_crates_a2.rs
diff --git a/src/test/auxiliary/changing-crates-b.rs b/src/test/auxiliary/changing_crates_b.rs
similarity index 100%
rename from src/test/auxiliary/changing-crates-b.rs
rename to src/test/auxiliary/changing_crates_b.rs
diff --git a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/auxiliary/crate_method_reexport_grrrrrrr2.rs
similarity index 100%
rename from src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs
rename to src/test/auxiliary/crate_method_reexport_grrrrrrr2.rs
diff --git a/src/test/auxiliary/crateresolve1-1.rs b/src/test/auxiliary/crateresolve1_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve1-1.rs
rename to src/test/auxiliary/crateresolve1_1.rs
diff --git a/src/test/auxiliary/crateresolve1-2.rs b/src/test/auxiliary/crateresolve1_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve1-2.rs
rename to src/test/auxiliary/crateresolve1_2.rs
diff --git a/src/test/auxiliary/crateresolve1-3.rs b/src/test/auxiliary/crateresolve1_3.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve1-3.rs
rename to src/test/auxiliary/crateresolve1_3.rs
diff --git a/src/test/auxiliary/crateresolve2-1.rs b/src/test/auxiliary/crateresolve2_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve2-1.rs
rename to src/test/auxiliary/crateresolve2_1.rs
diff --git a/src/test/auxiliary/crateresolve2-2.rs b/src/test/auxiliary/crateresolve2_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve2-2.rs
rename to src/test/auxiliary/crateresolve2_2.rs
diff --git a/src/test/auxiliary/crateresolve2-3.rs b/src/test/auxiliary/crateresolve2_3.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve2-3.rs
rename to src/test/auxiliary/crateresolve2_3.rs
diff --git a/src/test/auxiliary/crateresolve3-1.rs b/src/test/auxiliary/crateresolve3_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve3-1.rs
rename to src/test/auxiliary/crateresolve3_1.rs
diff --git a/src/test/auxiliary/crateresolve3-2.rs b/src/test/auxiliary/crateresolve3_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve3-2.rs
rename to src/test/auxiliary/crateresolve3_2.rs
diff --git a/src/test/auxiliary/crateresolve4a-1.rs b/src/test/auxiliary/crateresolve4a_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve4a-1.rs
rename to src/test/auxiliary/crateresolve4a_1.rs
diff --git a/src/test/auxiliary/crateresolve4a-2.rs b/src/test/auxiliary/crateresolve4a_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve4a-2.rs
rename to src/test/auxiliary/crateresolve4a_2.rs
diff --git a/src/test/auxiliary/crateresolve4b-1.rs b/src/test/auxiliary/crateresolve4b_1.rs
similarity index 82%
rename from src/test/auxiliary/crateresolve4b-1.rs
rename to src/test/auxiliary/crateresolve4b_1.rs
index 41eb0d604bd5..7a4a7aa993e9 100644
--- a/src/test/auxiliary/crateresolve4b-1.rs
+++ b/src/test/auxiliary/crateresolve4b_1.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:crateresolve4a-1.rs
-// aux-build:crateresolve4a-2.rs
+// aux-build:crateresolve4a_1.rs
+// aux-build:crateresolve4a_2.rs
 #![crate_id="crateresolve4b#0.1"]
 #![crate_type = "lib"]
 
-extern crate crateresolve4a = "crateresolve4a#0.2";
+extern crate crateresolve4a = crateresolve4a#0.2;
 
 pub fn f() -> int { crateresolve4a::g() }
diff --git a/src/test/auxiliary/crateresolve4b-2.rs b/src/test/auxiliary/crateresolve4b_2.rs
similarity index 82%
rename from src/test/auxiliary/crateresolve4b-2.rs
rename to src/test/auxiliary/crateresolve4b_2.rs
index 51541c8764c5..b7722a0c03db 100644
--- a/src/test/auxiliary/crateresolve4b-2.rs
+++ b/src/test/auxiliary/crateresolve4b_2.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:crateresolve4a-1.rs
-// aux-build:crateresolve4a-2.rs
+// aux-build:crateresolve4a_1.rs
+// aux-build:crateresolve4a_2.rs
 #![crate_id="crateresolve4b#0.2"]
 #![crate_type = "lib"]
 
-extern crate crateresolve4a = "crateresolve4a#0.1";
+extern crate crateresolve4a = crateresolve4a#0.1;
 
 pub fn g() -> int { crateresolve4a::f() }
diff --git a/src/test/auxiliary/crateresolve5-1.rs b/src/test/auxiliary/crateresolve5_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve5-1.rs
rename to src/test/auxiliary/crateresolve5_1.rs
diff --git a/src/test/auxiliary/crateresolve5-2.rs b/src/test/auxiliary/crateresolve5_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve5-2.rs
rename to src/test/auxiliary/crateresolve5_2.rs
diff --git a/src/test/auxiliary/crateresolve7x.rs b/src/test/auxiliary/crateresolve7x.rs
index 801ace7d8049..1351cb51d30f 100644
--- a/src/test/auxiliary/crateresolve7x.rs
+++ b/src/test/auxiliary/crateresolve7x.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:crateresolve_calories-1.rs
-// aux-build:crateresolve_calories-2.rs
+// aux-build:crateresolve_calories_1.rs
+// aux-build:crateresolve_calories_2.rs
 
 // These both have the same version but differ in other metadata
 pub mod a {
diff --git a/src/test/auxiliary/crateresolve8-1.rs b/src/test/auxiliary/crateresolve8_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve8-1.rs
rename to src/test/auxiliary/crateresolve8_1.rs
diff --git a/src/test/auxiliary/crateresolve_calories-1.rs b/src/test/auxiliary/crateresolve_calories_1.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve_calories-1.rs
rename to src/test/auxiliary/crateresolve_calories_1.rs
diff --git a/src/test/auxiliary/crateresolve_calories-2.rs b/src/test/auxiliary/crateresolve_calories_2.rs
similarity index 100%
rename from src/test/auxiliary/crateresolve_calories-2.rs
rename to src/test/auxiliary/crateresolve_calories_2.rs
diff --git a/src/test/auxiliary/extern-crosscrate-source.rs b/src/test/auxiliary/extern_crosscrate_source.rs
similarity index 96%
rename from src/test/auxiliary/extern-crosscrate-source.rs
rename to src/test/auxiliary/extern_crosscrate_source.rs
index e26f8effb47f..a238152a7c78 100644
--- a/src/test/auxiliary/extern-crosscrate-source.rs
+++ b/src/test/auxiliary/extern_crosscrate_source.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_id="externcallback#0.1"]
+#![crate_id="externcallback"]
 #![crate_type = "lib"]
 
 extern crate libc;
diff --git a/src/test/auxiliary/issue-10028.rs b/src/test/auxiliary/issue_10028.rs
similarity index 100%
rename from src/test/auxiliary/issue-10028.rs
rename to src/test/auxiliary/issue_10028.rs
diff --git a/src/test/auxiliary/issue-11224.rs b/src/test/auxiliary/issue_11224.rs
similarity index 100%
rename from src/test/auxiliary/issue-11224.rs
rename to src/test/auxiliary/issue_11224.rs
diff --git a/src/test/auxiliary/issue-11225-1.rs b/src/test/auxiliary/issue_11225_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-11225-1.rs
rename to src/test/auxiliary/issue_11225_1.rs
diff --git a/src/test/auxiliary/issue-11225-2.rs b/src/test/auxiliary/issue_11225_2.rs
similarity index 100%
rename from src/test/auxiliary/issue-11225-2.rs
rename to src/test/auxiliary/issue_11225_2.rs
diff --git a/src/test/auxiliary/issue-11508.rs b/src/test/auxiliary/issue_11508.rs
similarity index 100%
rename from src/test/auxiliary/issue-11508.rs
rename to src/test/auxiliary/issue_11508.rs
diff --git a/src/test/auxiliary/issue-11529.rs b/src/test/auxiliary/issue_11529.rs
similarity index 100%
rename from src/test/auxiliary/issue-11529.rs
rename to src/test/auxiliary/issue_11529.rs
diff --git a/src/test/auxiliary/issue-11680.rs b/src/test/auxiliary/issue_11680.rs
similarity index 100%
rename from src/test/auxiliary/issue-11680.rs
rename to src/test/auxiliary/issue_11680.rs
diff --git a/src/test/auxiliary/issue-11908-1.rs b/src/test/auxiliary/issue_11908_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-11908-1.rs
rename to src/test/auxiliary/issue_11908_1.rs
diff --git a/src/test/auxiliary/issue-11908-2.rs b/src/test/auxiliary/issue_11908_2.rs
similarity index 100%
rename from src/test/auxiliary/issue-11908-2.rs
rename to src/test/auxiliary/issue_11908_2.rs
diff --git a/src/test/auxiliary/issue-12133-dylib.rs b/src/test/auxiliary/issue_12133_dylib.rs
similarity index 100%
rename from src/test/auxiliary/issue-12133-dylib.rs
rename to src/test/auxiliary/issue_12133_dylib.rs
diff --git a/src/test/auxiliary/issue-12133-dylib2.rs b/src/test/auxiliary/issue_12133_dylib2.rs
similarity index 87%
rename from src/test/auxiliary/issue-12133-dylib2.rs
rename to src/test/auxiliary/issue_12133_dylib2.rs
index a978eacbfd1d..18024700a245 100644
--- a/src/test/auxiliary/issue-12133-dylib2.rs
+++ b/src/test/auxiliary/issue_12133_dylib2.rs
@@ -12,6 +12,6 @@
 
 #![crate_type = "dylib"]
 
-extern crate a = "issue-12133-rlib";
-extern crate b = "issue-12133-dylib";
+extern crate a = issue_12133_rlib;
+extern crate b = issue_12133_dylib;
 
diff --git a/src/test/auxiliary/issue-12133-rlib.rs b/src/test/auxiliary/issue_12133_rlib.rs
similarity index 100%
rename from src/test/auxiliary/issue-12133-rlib.rs
rename to src/test/auxiliary/issue_12133_rlib.rs
diff --git a/src/test/auxiliary/issue-12612-1.rs b/src/test/auxiliary/issue_12612_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-12612-1.rs
rename to src/test/auxiliary/issue_12612_1.rs
diff --git a/src/test/auxiliary/issue-12612-2.rs b/src/test/auxiliary/issue_12612_2.rs
similarity index 100%
rename from src/test/auxiliary/issue-12612-2.rs
rename to src/test/auxiliary/issue_12612_2.rs
diff --git a/src/test/auxiliary/issue-13560-1.rs b/src/test/auxiliary/issue_13560_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-13560-1.rs
rename to src/test/auxiliary/issue_13560_1.rs
diff --git a/src/test/auxiliary/issue-13560-2.rs b/src/test/auxiliary/issue_13560_2.rs
similarity index 100%
rename from src/test/auxiliary/issue-13560-2.rs
rename to src/test/auxiliary/issue_13560_2.rs
diff --git a/src/test/auxiliary/issue-13560-3.rs b/src/test/auxiliary/issue_13560_3.rs
similarity index 82%
rename from src/test/auxiliary/issue-13560-3.rs
rename to src/test/auxiliary/issue_13560_3.rs
index dfd13851774e..9cdeade06900 100644
--- a/src/test/auxiliary/issue-13560-3.rs
+++ b/src/test/auxiliary/issue_13560_3.rs
@@ -13,6 +13,6 @@
 #![crate_type = "rlib"]
 #![feature(phase)]
 
-#[phase(plugin)] extern crate t1 = "issue-13560-1";
-#[phase(plugin, link)] extern crate t2 = "issue-13560-2";
+#[phase(plugin)] extern crate t1 = issue_13560_1;
+#[phase(plugin, link)] extern crate t2 = issue_13560_2;
 
diff --git a/src/test/auxiliary/issue-13620-1.rs b/src/test/auxiliary/issue_13620_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-13620-1.rs
rename to src/test/auxiliary/issue_13620_1.rs
diff --git a/src/test/auxiliary/issue-13620-2.rs b/src/test/auxiliary/issue_13620_2.rs
similarity index 92%
rename from src/test/auxiliary/issue-13620-2.rs
rename to src/test/auxiliary/issue_13620_2.rs
index 6ad4a00a352d..9ddae5ec717b 100644
--- a/src/test/auxiliary/issue-13620-2.rs
+++ b/src/test/auxiliary/issue_13620_2.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate crate1 = "issue-13620-1";
+extern crate crate1 = issue_13620_1;
 
 pub static FOO2: crate1::Foo = crate1::FOO;
diff --git a/src/test/auxiliary/issue-13872-1.rs b/src/test/auxiliary/issue_13872_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-13872-1.rs
rename to src/test/auxiliary/issue_13872_1.rs
diff --git a/src/test/auxiliary/issue-13872-2.rs b/src/test/auxiliary/issue_13872_2.rs
similarity index 93%
rename from src/test/auxiliary/issue-13872-2.rs
rename to src/test/auxiliary/issue_13872_2.rs
index ebfada188580..912cbecc6691 100644
--- a/src/test/auxiliary/issue-13872-2.rs
+++ b/src/test/auxiliary/issue_13872_2.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate foo = "issue-13872-1";
+extern crate foo = issue_13872_1;
 
 pub use foo::B;
diff --git a/src/test/auxiliary/issue-13872-3.rs b/src/test/auxiliary/issue_13872_3.rs
similarity index 93%
rename from src/test/auxiliary/issue-13872-3.rs
rename to src/test/auxiliary/issue_13872_3.rs
index 7356b604a0e0..976e5526e3be 100644
--- a/src/test/auxiliary/issue-13872-3.rs
+++ b/src/test/auxiliary/issue_13872_3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate bar = "issue-13872-2";
+extern crate bar = issue_13872_2;
 
 use bar::B;
 
diff --git a/src/test/auxiliary/issue-14421.rs b/src/test/auxiliary/issue_14421.rs
similarity index 100%
rename from src/test/auxiliary/issue-14421.rs
rename to src/test/auxiliary/issue_14421.rs
diff --git a/src/test/auxiliary/issue-14422.rs b/src/test/auxiliary/issue_14422.rs
similarity index 100%
rename from src/test/auxiliary/issue-14422.rs
rename to src/test/auxiliary/issue_14422.rs
diff --git a/src/test/auxiliary/issue-2380.rs b/src/test/auxiliary/issue_2380.rs
similarity index 100%
rename from src/test/auxiliary/issue-2380.rs
rename to src/test/auxiliary/issue_2380.rs
diff --git a/src/test/auxiliary/issue-2414-a.rs b/src/test/auxiliary/issue_2414_a.rs
similarity index 100%
rename from src/test/auxiliary/issue-2414-a.rs
rename to src/test/auxiliary/issue_2414_a.rs
diff --git a/src/test/auxiliary/issue-2414-b.rs b/src/test/auxiliary/issue_2414_b.rs
similarity index 100%
rename from src/test/auxiliary/issue-2414-b.rs
rename to src/test/auxiliary/issue_2414_b.rs
diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue_2526.rs
similarity index 100%
rename from src/test/auxiliary/issue-2526.rs
rename to src/test/auxiliary/issue_2526.rs
diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue_2631_a.rs
similarity index 100%
rename from src/test/auxiliary/issue-2631-a.rs
rename to src/test/auxiliary/issue_2631_a.rs
diff --git a/src/test/auxiliary/issue-3012-1.rs b/src/test/auxiliary/issue_3012_1.rs
similarity index 100%
rename from src/test/auxiliary/issue-3012-1.rs
rename to src/test/auxiliary/issue_3012_1.rs
diff --git a/src/test/auxiliary/issue-4208-cc.rs b/src/test/auxiliary/issue_4208_cc.rs
similarity index 100%
rename from src/test/auxiliary/issue-4208-cc.rs
rename to src/test/auxiliary/issue_4208_cc.rs
diff --git a/src/test/auxiliary/issue-4545.rs b/src/test/auxiliary/issue_4545.rs
similarity index 100%
rename from src/test/auxiliary/issue-4545.rs
rename to src/test/auxiliary/issue_4545.rs
diff --git a/src/test/auxiliary/issue-5518.rs b/src/test/auxiliary/issue_5518.rs
similarity index 100%
rename from src/test/auxiliary/issue-5518.rs
rename to src/test/auxiliary/issue_5518.rs
diff --git a/src/test/auxiliary/issue-5521.rs b/src/test/auxiliary/issue_5521.rs
similarity index 100%
rename from src/test/auxiliary/issue-5521.rs
rename to src/test/auxiliary/issue_5521.rs
diff --git a/src/test/auxiliary/issue-7178.rs b/src/test/auxiliary/issue_7178.rs
similarity index 100%
rename from src/test/auxiliary/issue-7178.rs
rename to src/test/auxiliary/issue_7178.rs
diff --git a/src/test/auxiliary/issue-7899.rs b/src/test/auxiliary/issue_7899.rs
similarity index 100%
rename from src/test/auxiliary/issue-7899.rs
rename to src/test/auxiliary/issue_7899.rs
diff --git a/src/test/auxiliary/issue-8044.rs b/src/test/auxiliary/issue_8044.rs
similarity index 100%
rename from src/test/auxiliary/issue-8044.rs
rename to src/test/auxiliary/issue_8044.rs
diff --git a/src/test/auxiliary/issue-8259.rs b/src/test/auxiliary/issue_8259.rs
similarity index 100%
rename from src/test/auxiliary/issue-8259.rs
rename to src/test/auxiliary/issue_8259.rs
diff --git a/src/test/auxiliary/issue-9906.rs b/src/test/auxiliary/issue_9906.rs
similarity index 96%
rename from src/test/auxiliary/issue-9906.rs
rename to src/test/auxiliary/issue_9906.rs
index 1e746bf39db6..e000a22d044d 100644
--- a/src/test/auxiliary/issue-9906.rs
+++ b/src/test/auxiliary/issue_9906.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-9906.rs
+// aux-build:issue_9906.rs
 
 pub use other::FooBar;
 pub use other::foo;
diff --git a/src/test/auxiliary/issue-9968.rs b/src/test/auxiliary/issue_9968.rs
similarity index 100%
rename from src/test/auxiliary/issue-9968.rs
rename to src/test/auxiliary/issue_9968.rs
diff --git a/src/test/auxiliary/lang-item-public.rs b/src/test/auxiliary/lang_item_public.rs
similarity index 100%
rename from src/test/auxiliary/lang-item-public.rs
rename to src/test/auxiliary/lang_item_public.rs
diff --git a/src/test/auxiliary/linkage-visibility.rs b/src/test/auxiliary/linkage_visibility.rs
similarity index 100%
rename from src/test/auxiliary/linkage-visibility.rs
rename to src/test/auxiliary/linkage_visibility.rs
diff --git a/src/test/auxiliary/priv-impl-prim-ty.rs b/src/test/auxiliary/priv_impl_prim_ty.rs
similarity index 100%
rename from src/test/auxiliary/priv-impl-prim-ty.rs
rename to src/test/auxiliary/priv_impl_prim_ty.rs
diff --git a/src/test/auxiliary/privacy-struct-variant.rs b/src/test/auxiliary/privacy_struct_variant.rs
similarity index 100%
rename from src/test/auxiliary/privacy-struct-variant.rs
rename to src/test/auxiliary/privacy_struct_variant.rs
diff --git a/src/test/auxiliary/privacy-tuple-struct.rs b/src/test/auxiliary/privacy_tuple_struct.rs
similarity index 100%
rename from src/test/auxiliary/privacy-tuple-struct.rs
rename to src/test/auxiliary/privacy_tuple_struct.rs
diff --git a/src/test/auxiliary/reexport-should-still-link.rs b/src/test/auxiliary/reexport_should_still_link.rs
similarity index 100%
rename from src/test/auxiliary/reexport-should-still-link.rs
rename to src/test/auxiliary/reexport_should_still_link.rs
diff --git a/src/test/auxiliary/static-function-pointer-aux.rs b/src/test/auxiliary/static_function_pointer_aux.rs
similarity index 93%
rename from src/test/auxiliary/static-function-pointer-aux.rs
rename to src/test/auxiliary/static_function_pointer_aux.rs
index c08f725ff0a2..10f31562631d 100644
--- a/src/test/auxiliary/static-function-pointer-aux.rs
+++ b/src/test/auxiliary/static_function_pointer_aux.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_id="static-function-pointer-aux"]
+#![crate_id="static_function_pointer_aux"]
 
 pub fn f(x: int) -> int { -x }
 
diff --git a/src/test/auxiliary/static-methods-crate.rs b/src/test/auxiliary/static_methods_crate.rs
similarity index 100%
rename from src/test/auxiliary/static-methods-crate.rs
rename to src/test/auxiliary/static_methods_crate.rs
diff --git a/src/test/auxiliary/struct-field-privacy.rs b/src/test/auxiliary/struct_field_privacy.rs
similarity index 100%
rename from src/test/auxiliary/struct-field-privacy.rs
rename to src/test/auxiliary/struct_field_privacy.rs
diff --git a/src/test/auxiliary/svh-a-base.rs b/src/test/auxiliary/svh_a_base.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-base.rs
rename to src/test/auxiliary/svh_a_base.rs
diff --git a/src/test/auxiliary/svh-a-change-lit.rs b/src/test/auxiliary/svh_a_change_lit.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-lit.rs
rename to src/test/auxiliary/svh_a_change_lit.rs
diff --git a/src/test/auxiliary/svh-a-change-significant-cfg.rs b/src/test/auxiliary/svh_a_change_significant_cfg.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-significant-cfg.rs
rename to src/test/auxiliary/svh_a_change_significant_cfg.rs
diff --git a/src/test/auxiliary/svh-a-change-trait-bound.rs b/src/test/auxiliary/svh_a_change_trait_bound.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-trait-bound.rs
rename to src/test/auxiliary/svh_a_change_trait_bound.rs
diff --git a/src/test/auxiliary/svh-a-change-type-arg.rs b/src/test/auxiliary/svh_a_change_type_arg.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-type-arg.rs
rename to src/test/auxiliary/svh_a_change_type_arg.rs
diff --git a/src/test/auxiliary/svh-a-change-type-ret.rs b/src/test/auxiliary/svh_a_change_type_ret.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-type-ret.rs
rename to src/test/auxiliary/svh_a_change_type_ret.rs
diff --git a/src/test/auxiliary/svh-a-change-type-static.rs b/src/test/auxiliary/svh_a_change_type_static.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-change-type-static.rs
rename to src/test/auxiliary/svh_a_change_type_static.rs
diff --git a/src/test/auxiliary/svh-a-comment.rs b/src/test/auxiliary/svh_a_comment.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-comment.rs
rename to src/test/auxiliary/svh_a_comment.rs
diff --git a/src/test/auxiliary/svh-a-doc.rs b/src/test/auxiliary/svh_a_doc.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-doc.rs
rename to src/test/auxiliary/svh_a_doc.rs
diff --git a/src/test/auxiliary/svh-a-macro.rs b/src/test/auxiliary/svh_a_macro.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-macro.rs
rename to src/test/auxiliary/svh_a_macro.rs
diff --git a/src/test/auxiliary/svh-a-no-change.rs b/src/test/auxiliary/svh_a_no_change.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-no-change.rs
rename to src/test/auxiliary/svh_a_no_change.rs
diff --git a/src/test/auxiliary/svh-a-redundant-cfg.rs b/src/test/auxiliary/svh_a_redundant_cfg.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-redundant-cfg.rs
rename to src/test/auxiliary/svh_a_redundant_cfg.rs
diff --git a/src/test/auxiliary/svh-a-whitespace.rs b/src/test/auxiliary/svh_a_whitespace.rs
similarity index 100%
rename from src/test/auxiliary/svh-a-whitespace.rs
rename to src/test/auxiliary/svh_a_whitespace.rs
diff --git a/src/test/auxiliary/svh-b.rs b/src/test/auxiliary/svh_b.rs
similarity index 100%
rename from src/test/auxiliary/svh-b.rs
rename to src/test/auxiliary/svh_b.rs
diff --git a/src/test/auxiliary/svh-uta-base.rs b/src/test/auxiliary/svh_uta_base.rs
similarity index 100%
rename from src/test/auxiliary/svh-uta-base.rs
rename to src/test/auxiliary/svh_uta_base.rs
diff --git a/src/test/auxiliary/svh-uta-change-use-trait.rs b/src/test/auxiliary/svh_uta_change_use_trait.rs
similarity index 100%
rename from src/test/auxiliary/svh-uta-change-use-trait.rs
rename to src/test/auxiliary/svh_uta_change_use_trait.rs
diff --git a/src/test/auxiliary/svh-utb.rs b/src/test/auxiliary/svh_utb.rs
similarity index 100%
rename from src/test/auxiliary/svh-utb.rs
rename to src/test/auxiliary/svh_utb.rs
diff --git a/src/test/auxiliary/syntax-extension-with-dll-deps-1.rs b/src/test/auxiliary/syntax_extension_with_dll_deps_1.rs
similarity index 100%
rename from src/test/auxiliary/syntax-extension-with-dll-deps-1.rs
rename to src/test/auxiliary/syntax_extension_with_dll_deps_1.rs
diff --git a/src/test/auxiliary/syntax-extension-with-dll-deps-2.rs b/src/test/auxiliary/syntax_extension_with_dll_deps_2.rs
similarity index 94%
rename from src/test/auxiliary/syntax-extension-with-dll-deps-2.rs
rename to src/test/auxiliary/syntax_extension_with_dll_deps_2.rs
index 04318fcae273..a33e03d3c0c4 100644
--- a/src/test/auxiliary/syntax-extension-with-dll-deps-2.rs
+++ b/src/test/auxiliary/syntax_extension_with_dll_deps_2.rs
@@ -14,7 +14,7 @@
 #![crate_type = "dylib"]
 #![feature(plugin_registrar, quote, globs)]
 
-extern crate other = "syntax-extension-with-dll-deps-1";
+extern crate other = syntax_extension_with_dll_deps_1;
 extern crate syntax;
 extern crate rustc;
 
diff --git a/src/test/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/auxiliary/trait_default_method_xc_aux_2.rs
index 984264a969ce..acc71e63258f 100644
--- a/src/test/auxiliary/trait_default_method_xc_aux_2.rs
+++ b/src/test/auxiliary/trait_default_method_xc_aux_2.rs
@@ -10,7 +10,7 @@
 
 // aux-build:trait_default_method_xc_aux.rs
 
-extern crate aux = "trait_default_method_xc_aux";
+extern crate aux = trait_default_method_xc_aux;
 use aux::A;
 
 pub struct a_struct { pub x: int }
diff --git a/src/test/auxiliary/typeid-intrinsic.rs b/src/test/auxiliary/typeid_intrinsic.rs
similarity index 100%
rename from src/test/auxiliary/typeid-intrinsic.rs
rename to src/test/auxiliary/typeid_intrinsic.rs
diff --git a/src/test/auxiliary/typeid-intrinsic2.rs b/src/test/auxiliary/typeid_intrinsic2.rs
similarity index 100%
rename from src/test/auxiliary/typeid-intrinsic2.rs
rename to src/test/auxiliary/typeid_intrinsic2.rs
diff --git a/src/test/auxiliary/unreachable-variant.rs b/src/test/auxiliary/unreachable_variant.rs
similarity index 100%
rename from src/test/auxiliary/unreachable-variant.rs
rename to src/test/auxiliary/unreachable_variant.rs
diff --git a/src/test/auxiliary/weak-lang-items.rs b/src/test/auxiliary/weak_lang_items.rs
similarity index 100%
rename from src/test/auxiliary/weak-lang-items.rs
rename to src/test/auxiliary/weak_lang_items.rs
diff --git a/src/test/auxiliary/xcrate-trait-lifetime-param.rs b/src/test/auxiliary/xcrate_trait_lifetime_param.rs
similarity index 100%
rename from src/test/auxiliary/xcrate-trait-lifetime-param.rs
rename to src/test/auxiliary/xcrate_trait_lifetime_param.rs
diff --git a/src/test/compile-fail/bad-crate-id.rs b/src/test/compile-fail/bad-crate-id.rs
index 43956752cd9b..2cc4056af2d6 100644
--- a/src/test/compile-fail/bad-crate-id.rs
+++ b/src/test/compile-fail/bad-crate-id.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate foo = ""; //~ ERROR: malformed crate id
-extern crate bar = "#a"; //~ ERROR: malformed crate id
+extern crate foo = ; //~ ERROR expected string literal
 
 fn main() {}
diff --git a/src/test/compile-fail/changing-crates.rs b/src/test/compile-fail/changing-crates.rs
index ae3ef7606671..dcb6ae817570 100644
--- a/src/test/compile-fail/changing-crates.rs
+++ b/src/test/compile-fail/changing-crates.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:changing-crates-a1.rs
-// aux-build:changing-crates-b.rs
-// aux-build:changing-crates-a2.rs
+// aux-build:changing_crates_a1.rs
+// aux-build:changing_crates_b.rs
+// aux-build:changing_crates_a2.rs
 
 extern crate a;
 extern crate b; //~ ERROR: found possibly newer version of crate `a` which `b` depends on
diff --git a/src/test/compile-fail/crateresolve1.rs b/src/test/compile-fail/crateresolve1.rs
index 8c3dbda68020..7bdf6c89441d 100644
--- a/src/test/compile-fail/crateresolve1.rs
+++ b/src/test/compile-fail/crateresolve1.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:crateresolve1-1.rs
-// aux-build:crateresolve1-2.rs
-// aux-build:crateresolve1-3.rs
+// aux-build:crateresolve1_1.rs
+// aux-build:crateresolve1_2.rs
+// aux-build:crateresolve1_3.rs
 // error-pattern:multiple matching crates for `crateresolve1`
 
 extern crate crateresolve1;
diff --git a/src/test/compile-fail/crateresolve2.rs b/src/test/compile-fail/crateresolve2.rs
deleted file mode 100644
index c5e9d1281526..000000000000
--- a/src/test/compile-fail/crateresolve2.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve2-1.rs
-// aux-build:crateresolve2-2.rs
-// aux-build:crateresolve2-3.rs
-// error-pattern:using multiple versions of crate `crateresolve2`
-
-extern crate crateresolve2 = "crateresolve2#0.1";
-
-mod m {
-    pub extern crate crateresolve2 = "crateresolve2#0.2";
-}
-
-fn main() {
-    let x: int = false;
-}
diff --git a/src/test/compile-fail/crateresolve5.rs b/src/test/compile-fail/crateresolve5.rs
deleted file mode 100644
index 8b4801466b9b..000000000000
--- a/src/test/compile-fail/crateresolve5.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve5-1.rs
-// aux-build:crateresolve5-2.rs
-
-extern crate cr5_1 = "crateresolve5#0.1";
-extern crate cr5_2 = "crateresolve5#0.2";
-
-
-fn main() {
-    // Nominal types from two multiple versions of a crate are different types
-    assert!(cr5_1::nominal() == cr5_2::nominal()); //~ ERROR mismatched types: expected
-}
diff --git a/src/test/compile-fail/issue-11680.rs b/src/test/compile-fail/issue-11680.rs
index 9c9663a2f38c..71d37f1f9ef7 100644
--- a/src/test/compile-fail/issue-11680.rs
+++ b/src/test/compile-fail/issue-11680.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11680.rs
+// aux-build:issue_11680.rs
 
-extern crate other = "issue-11680";
+extern crate other = issue_11680;
 
 fn main() {
     let _b = other::Bar(1);
diff --git a/src/test/compile-fail/issue-11908-1.rs b/src/test/compile-fail/issue-11908-1.rs
index dbedf355a56c..4b2ec0033b8a 100644
--- a/src/test/compile-fail/issue-11908-1.rs
+++ b/src/test/compile-fail/issue-11908-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11908-1.rs
+// aux-build:issue_11908_1.rs
 // ignore-android this test is incompatible with the android test runner
 // error-pattern: multiple dylib candidates for `url` found
 
diff --git a/src/test/compile-fail/issue-11908-2.rs b/src/test/compile-fail/issue-11908-2.rs
index 8b916aad6535..c12a4106eec9 100644
--- a/src/test/compile-fail/issue-11908-2.rs
+++ b/src/test/compile-fail/issue-11908-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11908-2.rs
+// aux-build:issue_11908_2.rs
 // no-prefer-dynamic
 // ignore-android this test is incompatible with the android test runner
 // error-pattern: multiple rlib candidates for `url` found
diff --git a/src/test/compile-fail/issue-12612.rs b/src/test/compile-fail/issue-12612.rs
index 9d6eb4256789..988dd08712ee 100644
--- a/src/test/compile-fail/issue-12612.rs
+++ b/src/test/compile-fail/issue-12612.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-12612-1.rs
+// aux-build:issue_12612_1.rs
 
-extern crate foo = "issue-12612-1";
+extern crate foo = issue_12612_1;
 
 use foo::bar;
 
diff --git a/src/test/compile-fail/privacy-struct-variant.rs b/src/test/compile-fail/privacy-struct-variant.rs
index d6fab326ba16..1ecdc6d5e10c 100644
--- a/src/test/compile-fail/privacy-struct-variant.rs
+++ b/src/test/compile-fail/privacy-struct-variant.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:privacy-struct-variant.rs
+// aux-build:privacy_struct_variant.rs
 
 #![feature(struct_variant)]
 
-extern crate other = "privacy-struct-variant";
+extern crate other = privacy_struct_variant;
 
 mod a {
     pub enum Foo {
@@ -39,10 +39,10 @@ fn main() {
     //~^ ERROR: field `baz` of variant `Bar` of enum `a::Foo` is private
     //
     let foo = other::Bar { baz: 42 };
-    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy-struct-variant::Foo` is private
+    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy_struct_variant::Foo` is private
 
     let other::Bar { baz: _ } = foo;
-    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy-struct-variant::Foo` is private
+    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy_struct_variant::Foo` is private
     match foo { other::Bar { baz: _ } => {} }
-    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy-struct-variant::Foo` is private
+    //~^ ERROR: field `baz` of variant `Bar` of enum `privacy_struct_variant::Foo` is private
 }
diff --git a/src/test/compile-fail/privacy5.rs b/src/test/compile-fail/privacy5.rs
index 2683022c4c82..52951e4d7db5 100644
--- a/src/test/compile-fail/privacy5.rs
+++ b/src/test/compile-fail/privacy5.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:privacy-tuple-struct.rs
+// aux-build:privacy_tuple_struct.rs
 // ignore-fast
 
-extern crate other = "privacy-tuple-struct";
+extern crate other = privacy_tuple_struct;
 
 mod a {
     pub struct A(());
@@ -102,30 +102,30 @@ fn xcrate() {
     let c = other::C(2, 3); //~ ERROR: cannot invoke tuple struct constructor
     let d = other::D(4);
 
-    let other::A(()) = a; //~ ERROR: field #1 of struct `privacy-tuple-struct::A` is private
+    let other::A(()) = a; //~ ERROR: field #1 of struct `privacy_tuple_struct::A` is private
     let other::A(_) = a;
     match a { other::A(()) => {} }
-    //~^ ERROR: field #1 of struct `privacy-tuple-struct::A` is private
+    //~^ ERROR: field #1 of struct `privacy_tuple_struct::A` is private
     match a { other::A(_) => {} }
 
     let other::B(_) = b;
-    let other::B(_b) = b; //~ ERROR: field #1 of struct `privacy-tuple-struct::B` is private
+    let other::B(_b) = b; //~ ERROR: field #1 of struct `privacy_tuple_struct::B` is private
     match b { other::B(_) => {} }
     match b { other::B(_b) => {} }
-    //~^ ERROR: field #1 of struct `privacy-tuple-struct::B` is private
+    //~^ ERROR: field #1 of struct `privacy_tuple_struct::B` is private
     match b { other::B(1) => {} other::B(_) => {} }
-    //~^ ERROR: field #1 of struct `privacy-tuple-struct::B` is private
+    //~^ ERROR: field #1 of struct `privacy_tuple_struct::B` is private
 
     let other::C(_, _) = c;
     let other::C(_a, _) = c;
-    let other::C(_, _b) = c; //~ ERROR: field #2 of struct `privacy-tuple-struct::C` is private
-    let other::C(_a, _b) = c; //~ ERROR: field #2 of struct `privacy-tuple-struct::C` is private
+    let other::C(_, _b) = c; //~ ERROR: field #2 of struct `privacy_tuple_struct::C` is private
+    let other::C(_a, _b) = c; //~ ERROR: field #2 of struct `privacy_tuple_struct::C` is private
     match c { other::C(_, _) => {} }
     match c { other::C(_a, _) => {} }
     match c { other::C(_, _b) => {} }
-    //~^ ERROR: field #2 of struct `privacy-tuple-struct::C` is private
+    //~^ ERROR: field #2 of struct `privacy_tuple_struct::C` is private
     match c { other::C(_a, _b) => {} }
-    //~^ ERROR: field #2 of struct `privacy-tuple-struct::C` is private
+    //~^ ERROR: field #2 of struct `privacy_tuple_struct::C` is private
 
     let other::D(_) = d;
     let other::D(_d) = d;
diff --git a/src/test/compile-fail/struct-field-privacy.rs b/src/test/compile-fail/struct-field-privacy.rs
index 82ba9a02a304..e6b3edd0ba2c 100644
--- a/src/test/compile-fail/struct-field-privacy.rs
+++ b/src/test/compile-fail/struct-field-privacy.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:struct-field-privacy.rs
+// aux-build:struct_field_privacy.rs
 
-extern crate xc = "struct-field-privacy";
+extern crate xc = struct_field_privacy;
 
 struct A {
     a: int,
@@ -37,11 +37,11 @@ fn test(a: A, b: inner::A, c: inner::B, d: xc::A, e: xc::B) {
     c.a;
     c.b; //~ ERROR: field `b` of struct `inner::B` is private
 
-    d.a; //~ ERROR: field `a` of struct `struct-field-privacy::A` is private
+    d.a; //~ ERROR: field `a` of struct `struct_field_privacy::A` is private
     d.b;
 
     e.a;
-    e.b; //~ ERROR: field `b` of struct `struct-field-privacy::B` is private
+    e.b; //~ ERROR: field `b` of struct `struct_field_privacy::B` is private
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/svh-change-lit.rs b/src/test/compile-fail/svh-change-lit.rs
index 179fb11d5fe5..fd8880d4ceab 100644
--- a/src/test/compile-fail/svh-change-lit.rs
+++ b/src/test/compile-fail/svh-change-lit.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-lit.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_lit.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-change-significant-cfg.rs b/src/test/compile-fail/svh-change-significant-cfg.rs
index 1f65f3873a94..c8993a0956cb 100644
--- a/src/test/compile-fail/svh-change-significant-cfg.rs
+++ b/src/test/compile-fail/svh-change-significant-cfg.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-significant-cfg.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_significant_cfg.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-change-trait-bound.rs b/src/test/compile-fail/svh-change-trait-bound.rs
index 4e4f7b232f46..33dafa8e4dae 100644
--- a/src/test/compile-fail/svh-change-trait-bound.rs
+++ b/src/test/compile-fail/svh-change-trait-bound.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-trait-bound.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_trait_bound.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-change-type-arg.rs b/src/test/compile-fail/svh-change-type-arg.rs
index 77b0a9211caf..f3d0d2987ee6 100644
--- a/src/test/compile-fail/svh-change-type-arg.rs
+++ b/src/test/compile-fail/svh-change-type-arg.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-type-arg.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_type_arg.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-change-type-ret.rs b/src/test/compile-fail/svh-change-type-ret.rs
index 13dcfa3b5da5..75596848e92f 100644
--- a/src/test/compile-fail/svh-change-type-ret.rs
+++ b/src/test/compile-fail/svh-change-type-ret.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-type-ret.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_type_ret.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-change-type-static.rs b/src/test/compile-fail/svh-change-type-static.rs
index 7d26bdd15fb2..18ffb3d2d51a 100644
--- a/src/test/compile-fail/svh-change-type-static.rs
+++ b/src/test/compile-fail/svh-change-type-static.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-change-type-static.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_change_type_static.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/compile-fail/svh-use-trait.rs b/src/test/compile-fail/svh-use-trait.rs
index 7fdbf35fc6d5..da195ec74442 100644
--- a/src/test/compile-fail/svh-use-trait.rs
+++ b/src/test/compile-fail/svh-use-trait.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-uta-base.rs
-// aux-build:svh-utb.rs
-// aux-build:svh-uta-change-use-trait.rs
+// aux-build:svh_uta_base.rs
+// aux-build:svh_utb.rs
+// aux-build:svh_uta_change_use_trait.rs
 
 //! "compile-fail/svh-uta-trait.rs" is checking that we detect a
 //! change from `use foo::TraitB` to use `foo::TraitB` in the hash
diff --git a/src/test/compile-fail/unreachable-variant.rs b/src/test/compile-fail/unreachable-variant.rs
index 566b888099ca..897d5ff5916e 100644
--- a/src/test/compile-fail/unreachable-variant.rs
+++ b/src/test/compile-fail/unreachable-variant.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:unreachable-variant.rs
+// aux-build:unreachable_variant.rs
 
-extern crate other = "unreachable-variant";
+extern crate other = unreachable_variant;
 
 fn main() {
     let _x = other::super_sekrit::baz; //~ ERROR is private
diff --git a/src/test/compile-fail/use-meta-mismatch.rs b/src/test/compile-fail/use-meta-mismatch.rs
index 0d84a59fc9ec..4e27c11ed566 100644
--- a/src/test/compile-fail/use-meta-mismatch.rs
+++ b/src/test/compile-fail/use-meta-mismatch.rs
@@ -10,6 +10,6 @@
 
 // error-pattern:can't find crate for `extra`
 
-extern crate extra = "fake-crate";
+extern crate extra = fake_crate;
 
 fn main() { }
diff --git a/src/test/compile-fail/weak-lang-item.rs b/src/test/compile-fail/weak-lang-item.rs
index a1b64b77ac16..e526f99ea6f8 100644
--- a/src/test/compile-fail/weak-lang-item.rs
+++ b/src/test/compile-fail/weak-lang-item.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:weak-lang-items.rs
+// aux-build:weak_lang_items.rs
 // error-pattern: language item required, but not found: `begin_unwind`
 // error-pattern: language item required, but not found: `stack_exhausted`
 // error-pattern: language item required, but not found: `eh_personality`
@@ -16,4 +16,4 @@
 #![no_std]
 
 extern crate core;
-extern crate other = "weak-lang-items";
+extern crate other = weak_lang_items;
diff --git a/src/test/pretty/raw-str-nonexpr.rs b/src/test/pretty/raw-str-nonexpr.rs
index 5cc5705ed75e..43ad898fc7a1 100644
--- a/src/test/pretty/raw-str-nonexpr.rs
+++ b/src/test/pretty/raw-str-nonexpr.rs
@@ -13,6 +13,4 @@
 #![feature(asm)]
 
 #[cfg = r#"just parse this"#]
-extern crate blah = r##"blah"##;
-
 fn main() { unsafe { asm!(r###"blah"###); } }
diff --git a/src/test/run-pass-fulldeps/issue-13560.rs b/src/test/run-pass-fulldeps/issue-13560.rs
index d72c82852dd7..3184d0146da5 100644
--- a/src/test/run-pass-fulldeps/issue-13560.rs
+++ b/src/test/run-pass-fulldeps/issue-13560.rs
@@ -8,15 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-13560-1.rs
-// aux-build:issue-13560-2.rs
-// aux-build:issue-13560-3.rs
+// aux-build:issue_13560_1.rs
+// aux-build:issue_13560_2.rs
+// aux-build:issue_13560_3.rs
 // ignore-stage1
 
 // Regression test for issue #13560, the test itself is all in the dependent
 // libraries. The fail which previously failed to compile is the one numbered 3.
 
-extern crate t2 = "issue-13560-2";
-extern crate t3 = "issue-13560-3";
+extern crate t2 = issue_13560_2;
+extern crate t3 = issue_13560_3;
 
 fn main() {}
diff --git a/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs b/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs
index 275463f5d7fc..c2434842c7bf 100644
--- a/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs
+++ b/src/test/run-pass-fulldeps/syntax-extension-with-dll-deps.rs
@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:syntax-extension-with-dll-deps-1.rs
-// aux-build:syntax-extension-with-dll-deps-2.rs
+// aux-build:syntax_extension_with_dll_deps_1.rs
+// aux-build:syntax_extension_with_dll_deps_2.rs
 // ignore-stage1
 
 #![feature(phase)]
 
 #[phase(plugin)]
-extern crate extension = "syntax-extension-with-dll-deps-2";
+extern crate extension = syntax_extension_with_dll_deps_2;
 
 fn main() {
     foo!();
diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
index 0ef666031114..39e9abac78f5 100644
--- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
+++ b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:anon-extern-mod-cross-crate-1.rs
+// aux-build:anon_extern_mod_cross_crate_1.rs
 extern crate anonexternmod;
 
 use anonexternmod::rust_get_test_int;
diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
index 456f7ec3e99f..331a0e317d46 100644
--- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
+++ b/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
@@ -14,7 +14,7 @@
 // name_pool::methods impl in the other crate is reachable from this
 // crate.
 
-// aux-build:crate-method-reexport-grrrrrrr2.rs
+// aux-build:crate_method_reexport_grrrrrrr2.rs
 
 extern crate crate_method_reexport_grrrrrrr2;
 
diff --git a/src/test/run-pass/crateresolve1.rs b/src/test/run-pass/crateresolve1.rs
deleted file mode 100644
index 61e269bf9e35..000000000000
--- a/src/test/run-pass/crateresolve1.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve1-1.rs
-// aux-build:crateresolve1-2.rs
-// aux-build:crateresolve1-3.rs
-
-extern crate crateresolve1 = "crateresolve1#0.2";
-
-pub fn main() {
-    assert_eq!(crateresolve1::f(), 20);
-}
diff --git a/src/test/run-pass/crateresolve2.rs b/src/test/run-pass/crateresolve2.rs
deleted file mode 100644
index 5ed1f37c7b9e..000000000000
--- a/src/test/run-pass/crateresolve2.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve2-1.rs
-// aux-build:crateresolve2-2.rs
-// aux-build:crateresolve2-3.rs
-
-mod a {
-    extern crate crateresolve2 = "crateresolve2#0.1";
-    pub fn f() { assert!(crateresolve2::f() == 10); }
-}
-
-mod b {
-    extern crate crateresolve2 = "crateresolve2#0.2";
-    pub fn f() { assert!(crateresolve2::f() == 20); }
-}
-
-mod c {
-    extern crate crateresolve2 = "crateresolve2#0.3";
-    pub fn f() { assert!(crateresolve2::f() == 30); }
-}
-
-pub fn main() {
-    a::f();
-    b::f();
-    c::f();
-}
diff --git a/src/test/run-pass/crateresolve3.rs b/src/test/run-pass/crateresolve3.rs
deleted file mode 100644
index cee9e6991c45..000000000000
--- a/src/test/run-pass/crateresolve3.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve3-1.rs
-// aux-build:crateresolve3-2.rs
-
-// verify able to link with crates with same name but different versions
-// as long as no name collision on invoked functions.
-
-mod a {
-    extern crate crateresolve3 = "crateresolve3#0.1";
-    pub fn f() { assert!(crateresolve3::f() == 10); }
-}
-
-mod b {
-    extern crate crateresolve3 = "crateresolve3#0.2";
-    pub fn f() { assert!(crateresolve3::g() == 20); }
-}
-
-pub fn main() {
-    a::f();
-    b::f();
-}
diff --git a/src/test/run-pass/crateresolve4.rs b/src/test/run-pass/crateresolve4.rs
deleted file mode 100644
index c68961522269..000000000000
--- a/src/test/run-pass/crateresolve4.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve4a-1.rs
-// aux-build:crateresolve4a-2.rs
-// aux-build:crateresolve4b-1.rs
-// aux-build:crateresolve4b-2.rs
-
-pub mod a {
-    extern crate crateresolve4b = "crateresolve4b#0.1";
-    pub fn f() { assert!(crateresolve4b::f() == 20); }
-}
-
-pub mod b {
-    extern crate crateresolve4b = "crateresolve4b#0.2";
-    pub fn f() { assert!(crateresolve4b::g() == 10); }
-}
-
-pub fn main() {
-    a::f();
-    b::f();
-}
diff --git a/src/test/run-pass/crateresolve5.rs b/src/test/run-pass/crateresolve5.rs
deleted file mode 100644
index 3f74731090b6..000000000000
--- a/src/test/run-pass/crateresolve5.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve5-1.rs
-// aux-build:crateresolve5-2.rs
-
-extern crate cr5_1 = "crateresolve5#0.1";
-extern crate cr5_2 = "crateresolve5#0.2";
-
-pub fn main() {
-    // Structural types can be used between two versions of the same crate
-    assert!(cr5_1::struct_nameval().name == cr5_2::struct_nameval().name);
-    assert!(cr5_1::struct_nameval().val == cr5_2::struct_nameval().val);
-    // Make sure these are actually two different crates
-    assert!(cr5_1::f() == 10 && cr5_2::f() == 20);
-}
diff --git a/src/test/run-pass/crateresolve8.rs b/src/test/run-pass/crateresolve8.rs
deleted file mode 100644
index f04e383cb3dc..000000000000
--- a/src/test/run-pass/crateresolve8.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// aux-build:crateresolve8-1.rs
-
-#![crate_id="crateresolve8#0.1"]
-
-extern crate crateresolve8 = "crateresolve8#0.1";
-//extern crate crateresolve8(vers = "0.1");
-
-pub fn main() {
-    assert_eq!(crateresolve8::f(), 20);
-}
diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/run-pass/duplicated-external-mods.rs
index 65e2b178abf7..1dc63cb4d217 100644
--- a/src/test/run-pass/duplicated-external-mods.rs
+++ b/src/test/run-pass/duplicated-external-mods.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:anon-extern-mod-cross-crate-1.rs
-// aux-build:anon-extern-mod-cross-crate-1.rs
+// aux-build:anon_extern_mod_cross_crate_1.rs
+// aux-build:anon_extern_mod_cross_crate_1.rs
 extern crate anonexternmod;
 
 pub fn main() { }
diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/run-pass/extern-crosscrate.rs
index 3faf57441998..526b16945b1e 100644
--- a/src/test/run-pass/extern-crosscrate.rs
+++ b/src/test/run-pass/extern-crosscrate.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-//aux-build:extern-crosscrate-source.rs
+//aux-build:extern_crosscrate_source.rs
 
-extern crate externcallback = "externcallback#0.1";
+extern crate externcallback = externcallback;
 
 fn fact(n: uint) -> uint {
     unsafe {
diff --git a/src/test/run-pass/extern-foreign-crate.rs b/src/test/run-pass/extern-foreign-crate.rs
index 434b684756b6..dafb4e7c3730 100644
--- a/src/test/run-pass/extern-foreign-crate.rs
+++ b/src/test/run-pass/extern-foreign-crate.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate mystd = "std";
+extern crate mystd = std;
 
 pub fn main() {}
diff --git a/src/test/run-pass/issue-10028.rs b/src/test/run-pass/issue-10028.rs
index f4f7e24d156f..8b49ecb05684 100644
--- a/src/test/run-pass/issue-10028.rs
+++ b/src/test/run-pass/issue-10028.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-10028.rs
+// aux-build:issue_10028.rs
 
-extern crate issue10028 = "issue-10028";
+extern crate issue10028 = issue_10028;
 
 use issue10028::ZeroLengthThingWithDestructor;
 
diff --git a/src/test/run-pass/issue-11224.rs b/src/test/run-pass/issue-11224.rs
index c247893ef6b0..4e0c61e0886e 100644
--- a/src/test/run-pass/issue-11224.rs
+++ b/src/test/run-pass/issue-11224.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11224.rs
+// aux-build:issue_11224.rs
 
-extern crate unused = "issue-11224";
+extern crate unused = issue_11224;
 
 pub fn main() {}
diff --git a/src/test/run-pass/issue-11225-1.rs b/src/test/run-pass/issue-11225-1.rs
index ecedeaba7517..d1402999a859 100644
--- a/src/test/run-pass/issue-11225-1.rs
+++ b/src/test/run-pass/issue-11225-1.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11225-1.rs
+// aux-build:issue_11225_1.rs
 
-extern crate foo = "issue-11225-1";
+extern crate foo = issue_11225_1;
 
 pub fn main() {
     foo::foo(1);
diff --git a/src/test/run-pass/issue-11225-2.rs b/src/test/run-pass/issue-11225-2.rs
index 774d9e6d1b8a..ba0a454f5b4b 100644
--- a/src/test/run-pass/issue-11225-2.rs
+++ b/src/test/run-pass/issue-11225-2.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11225-2.rs
+// aux-build:issue_11225_2.rs
 
-extern crate foo = "issue-11225-2";
+extern crate foo = issue_11225_2;
 
 pub fn main() {
     foo::foo(1);
diff --git a/src/test/run-pass/issue-11508.rs b/src/test/run-pass/issue-11508.rs
index 25d3a241ebdb..f2f9b7dfe2d2 100644
--- a/src/test/run-pass/issue-11508.rs
+++ b/src/test/run-pass/issue-11508.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11508.rs
+// aux-build:issue_11508.rs
 
-extern crate rand = "issue-11508";
+extern crate rand = issue_11508;
 
 use rand::{Closed01, random};
 
diff --git a/src/test/run-pass/issue-11529.rs b/src/test/run-pass/issue-11529.rs
index c11f7c79db19..7aaa54ec8b44 100644
--- a/src/test/run-pass/issue-11529.rs
+++ b/src/test/run-pass/issue-11529.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-11529.rs
+// aux-build:issue_11529.rs
 
-extern crate a = "issue-11529";
+extern crate a = issue_11529;
 
 fn main() {
     let one = 1;
diff --git a/src/test/run-pass/issue-12133-1.rs b/src/test/run-pass/issue-12133-1.rs
index 91003672f3a5..0d5e8507fcaf 100644
--- a/src/test/run-pass/issue-12133-1.rs
+++ b/src/test/run-pass/issue-12133-1.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-12133-rlib.rs
-// aux-build:issue-12133-dylib.rs
+// aux-build:issue_12133_rlib.rs
+// aux-build:issue_12133_dylib.rs
 
-extern crate a = "issue-12133-rlib";
-extern crate b = "issue-12133-dylib";
+extern crate a = issue_12133_rlib;
+extern crate b = issue_12133_dylib;
 
 fn main() {}
diff --git a/src/test/run-pass/issue-12133-2.rs b/src/test/run-pass/issue-12133-2.rs
index 877d4f706e96..8d740cc0500f 100644
--- a/src/test/run-pass/issue-12133-2.rs
+++ b/src/test/run-pass/issue-12133-2.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-12133-rlib.rs
-// aux-build:issue-12133-dylib.rs
+// aux-build:issue_12133_rlib.rs
+// aux-build:issue_12133_dylib.rs
 // no-prefer-dynamic
 
-extern crate a = "issue-12133-rlib";
-extern crate b = "issue-12133-dylib";
+extern crate a = issue_12133_rlib;
+extern crate b = issue_12133_dylib;
 
 fn main() {}
diff --git a/src/test/run-pass/issue-12133-3.rs b/src/test/run-pass/issue-12133-3.rs
index 35f4d86efe05..3b17ff854303 100644
--- a/src/test/run-pass/issue-12133-3.rs
+++ b/src/test/run-pass/issue-12133-3.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-12133-rlib.rs
-// aux-build:issue-12133-dylib.rs
-// aux-build:issue-12133-dylib2.rs
+// aux-build:issue_12133_rlib.rs
+// aux-build:issue_12133_dylib.rs
+// aux-build:issue_12133_dylib2.rs
 
-extern crate other = "issue-12133-dylib2";
+extern crate other = issue_12133_dylib2;
 
 fn main() {}
diff --git a/src/test/run-pass/issue-12612.rs b/src/test/run-pass/issue-12612.rs
index fcb658036b6b..29c221cfd857 100644
--- a/src/test/run-pass/issue-12612.rs
+++ b/src/test/run-pass/issue-12612.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-12612-1.rs
-// aux-build:issue-12612-2.rs
+// aux-build:issue_12612_1.rs
+// aux-build:issue_12612_2.rs
 
-extern crate foo = "issue-12612-1";
-extern crate bar = "issue-12612-2";
+extern crate foo = issue_12612_1;
+extern crate bar = issue_12612_2;
 
 use foo::bar;
 
diff --git a/src/test/run-pass/issue-13620.rs b/src/test/run-pass/issue-13620.rs
index 13baa80781b0..b1ef64bd57ea 100644
--- a/src/test/run-pass/issue-13620.rs
+++ b/src/test/run-pass/issue-13620.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-13620-1.rs
-// aux-build:issue-13620-2.rs
+// aux-build:issue_13620_1.rs
+// aux-build:issue_13620_2.rs
 
-extern crate crate2 = "issue-13620-2";
+extern crate crate2 = issue_13620_2;
 
 fn main() {
     (crate2::FOO2.foo)();
diff --git a/src/test/run-pass/issue-13872.rs b/src/test/run-pass/issue-13872.rs
index 3c19e908e16e..c15f52a18f6a 100644
--- a/src/test/run-pass/issue-13872.rs
+++ b/src/test/run-pass/issue-13872.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-13872-1.rs
-// aux-build:issue-13872-2.rs
-// aux-build:issue-13872-3.rs
+// aux-build:issue_13872_1.rs
+// aux-build:issue_13872_2.rs
+// aux-build:issue_13872_3.rs
 
-extern crate other = "issue-13872-3";
+extern crate other = issue_13872_3;
 
 fn main() {
     other::foo();
diff --git a/src/test/run-pass/issue-14421.rs b/src/test/run-pass/issue-14421.rs
index cf88131048e4..4ce54ad3847f 100644
--- a/src/test/run-pass/issue-14421.rs
+++ b/src/test/run-pass/issue-14421.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-14421.rs
+// aux-build:issue_14421.rs
 
-extern crate bug_lib = "issue-14421";
+extern crate bug_lib = issue_14421;
 
 use bug_lib::B;
 use bug_lib::make;
diff --git a/src/test/run-pass/issue-14422.rs b/src/test/run-pass/issue-14422.rs
index b4d5a377b990..0cb96e3bc5ec 100644
--- a/src/test/run-pass/issue-14422.rs
+++ b/src/test/run-pass/issue-14422.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-14422.rs
+// aux-build:issue_14422.rs
 
-extern crate bug_lib = "issue-14422";
+extern crate bug_lib = issue_14422;
 
 use bug_lib::B;
 use bug_lib::make;
diff --git a/src/test/run-pass/issue-2380-b.rs b/src/test/run-pass/issue-2380-b.rs
index 22976aac6e77..14df64af567c 100644
--- a/src/test/run-pass/issue-2380-b.rs
+++ b/src/test/run-pass/issue-2380-b.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-2380.rs
+// aux-build:issue_2380.rs
 
 extern crate a;
 
diff --git a/src/test/run-pass/issue-2414-c.rs b/src/test/run-pass/issue-2414-c.rs
index 0b891fbddccf..11caa7cfd1ae 100644
--- a/src/test/run-pass/issue-2414-c.rs
+++ b/src/test/run-pass/issue-2414-c.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-2414-a.rs
-// aux-build:issue-2414-b.rs
+// aux-build:issue_2414_a.rs
+// aux-build:issue_2414_b.rs
 
 extern crate b;
 
diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/run-pass/issue-2526-a.rs
index a8cbb0911b8a..a2f58239d9db 100644
--- a/src/test/run-pass/issue-2526-a.rs
+++ b/src/test/run-pass/issue-2526-a.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-2526.rs
+// aux-build:issue_2526.rs
 
 #![feature(globs)]
 #![allow(unused_imports)]
diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs
index 5f2f2c4b1b50..f7b56996557d 100644
--- a/src/test/run-pass/issue-2631-b.rs
+++ b/src/test/run-pass/issue-2631-b.rs
@@ -10,7 +10,7 @@
 
 #![feature(managed_boxes)]
 
-// aux-build:issue-2631-a.rs
+// aux-build:issue_2631_a.rs
 
 extern crate collections;
 extern crate req;
diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/run-pass/issue-3012-2.rs
index 7f630de45dac..5f7d3b0ab0f1 100644
--- a/src/test/run-pass/issue-3012-2.rs
+++ b/src/test/run-pass/issue-3012-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-3012-1.rs
+// aux-build:issue_3012_1.rs
 
 #![feature(managed_boxes)]
 
diff --git a/src/test/run-pass/issue-4208.rs b/src/test/run-pass/issue-4208.rs
index c186f1e57f9a..ce00a60a252e 100644
--- a/src/test/run-pass/issue-4208.rs
+++ b/src/test/run-pass/issue-4208.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-4208-cc.rs
+// aux-build:issue_4208_cc.rs
 
 extern crate numeric;
 use numeric::{sin, Angle};
diff --git a/src/test/run-pass/issue-4545.rs b/src/test/run-pass/issue-4545.rs
index fdcee2e3b610..bab5c96fe807 100644
--- a/src/test/run-pass/issue-4545.rs
+++ b/src/test/run-pass/issue-4545.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-4545.rs
+// aux-build:issue_4545.rs
 
-extern crate somelib = "issue-4545";
+extern crate somelib = issue_4545;
 pub fn main() { somelib::mk::<int>(); }
diff --git a/src/test/run-pass/issue-5518.rs b/src/test/run-pass/issue-5518.rs
index bc24870e5df7..406be7fb6305 100644
--- a/src/test/run-pass/issue-5518.rs
+++ b/src/test/run-pass/issue-5518.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-5518.rs
+// aux-build:issue_5518.rs
 
-extern crate other = "issue-5518";
+extern crate other = issue_5518;
 
 fn main() {}
diff --git a/src/test/run-pass/issue-5521.rs b/src/test/run-pass/issue-5521.rs
index ffc867533450..a0d2a999cd32 100644
--- a/src/test/run-pass/issue-5521.rs
+++ b/src/test/run-pass/issue-5521.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-5521.rs
+// aux-build:issue_5521.rs
 
 #![feature(managed_boxes)]
 
-extern crate foo = "issue-5521";
+extern crate foo = issue_5521;
 
 fn foo(a: foo::map) {
     if false {
diff --git a/src/test/run-pass/issue-7178.rs b/src/test/run-pass/issue-7178.rs
index b11521b23b2b..58a2c85797b6 100644
--- a/src/test/run-pass/issue-7178.rs
+++ b/src/test/run-pass/issue-7178.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-7178.rs
+// aux-build:issue_7178.rs
 
-extern crate cross_crate_self = "issue-7178";
+extern crate cross_crate_self = issue_7178;
 
 pub fn main() {
     let _ = cross_crate_self::Foo::new(&1i);
diff --git a/src/test/run-pass/issue-7899.rs b/src/test/run-pass/issue-7899.rs
index 84c7cce22765..f1cce85a3721 100644
--- a/src/test/run-pass/issue-7899.rs
+++ b/src/test/run-pass/issue-7899.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-7899.rs
+// aux-build:issue_7899.rs
 
-extern crate testcrate = "issue-7899";
+extern crate testcrate = issue_7899;
 
 fn main() {
     let f = testcrate::V2(1.0f32, 2.0f32);
diff --git a/src/test/run-pass/issue-8044.rs b/src/test/run-pass/issue-8044.rs
index 06f41e9cb7a7..5a48ad2abcd0 100644
--- a/src/test/run-pass/issue-8044.rs
+++ b/src/test/run-pass/issue-8044.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-8044.rs
+// aux-build:issue_8044.rs
 
-extern crate minimal = "issue-8044";
+extern crate minimal = issue_8044;
 use minimal::{BTree, leaf};
 
 pub fn main() {
diff --git a/src/test/run-pass/issue-8259.rs b/src/test/run-pass/issue-8259.rs
index 484df4744035..972ac80c9a83 100644
--- a/src/test/run-pass/issue-8259.rs
+++ b/src/test/run-pass/issue-8259.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-8259.rs
+// aux-build:issue_8259.rs
 
-extern crate other = "issue-8259";
+extern crate other = issue_8259;
 static a: other::Foo<'static> = other::A;
 
 pub fn main() {}
diff --git a/src/test/run-pass/issue-9906.rs b/src/test/run-pass/issue-9906.rs
index 6b8e250ea74b..6e09a5af6ae3 100644
--- a/src/test/run-pass/issue-9906.rs
+++ b/src/test/run-pass/issue-9906.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-9906.rs
+// aux-build:issue_9906.rs
 
-extern crate testmod = "issue-9906";
+extern crate testmod = issue_9906;
 
 pub fn main() {
     testmod::foo();
diff --git a/src/test/run-pass/issue-9968.rs b/src/test/run-pass/issue-9968.rs
index 8768a76a9a21..f6cba3477fb1 100644
--- a/src/test/run-pass/issue-9968.rs
+++ b/src/test/run-pass/issue-9968.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:issue-9968.rs
+// aux-build:issue_9968.rs
 
-extern crate lib = "issue-9968";
+extern crate lib = issue_9968;
 
 use lib::{Trait, Struct};
 
diff --git a/src/test/run-pass/lang-item-public.rs b/src/test/run-pass/lang-item-public.rs
index 23e48b97427c..1b3be70d2b7e 100644
--- a/src/test/run-pass/lang-item-public.rs
+++ b/src/test/run-pass/lang-item-public.rs
@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:lang-item-public.rs
+// aux-build:lang_item_public.rs
 // ignore-android
 // ignore-win32 #13361
 
 #![no_std]
 
-extern crate lang_lib = "lang-item-public";
+extern crate lang_lib = lang_item_public;
 
 #[cfg(target_os = "linux")]
 #[link(name = "c")]
diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs
index 58f66314e443..471fc4f1ef25 100644
--- a/src/test/run-pass/linkage-visibility.rs
+++ b/src/test/run-pass/linkage-visibility.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:linkage-visibility.rs
+// aux-build:linkage_visibility.rs
 // ignore-android: FIXME(#10379)
 // ignore-win32: std::dynamic_lib does not work on win32 well
 
-extern crate foo = "linkage-visibility";
+extern crate foo = linkage_visibility;
 
 pub fn main() {
     foo::test();
diff --git a/src/test/run-pass/linkage1.rs b/src/test/run-pass/linkage1.rs
index 2eafd34afcac..4ca4ed251d58 100644
--- a/src/test/run-pass/linkage1.rs
+++ b/src/test/run-pass/linkage1.rs
@@ -15,7 +15,7 @@
 
 #![feature(linkage)]
 
-extern crate other = "linkage1";
+extern crate other = linkage1;
 
 extern {
     #[linkage = "extern_weak"]
diff --git a/src/test/run-pass/priv-impl-prim-ty.rs b/src/test/run-pass/priv-impl-prim-ty.rs
index 6af189926366..67d0800cdbc8 100644
--- a/src/test/run-pass/priv-impl-prim-ty.rs
+++ b/src/test/run-pass/priv-impl-prim-ty.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:priv-impl-prim-ty.rs
+// aux-build:priv_impl_prim_ty.rs
 
-extern crate bar = "priv-impl-prim-ty";
+extern crate bar = priv_impl_prim_ty;
 
 pub fn main() {
     bar::frob(1i);
diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/run-pass/reexport-should-still-link.rs
index c63d50d898c7..394097295dc1 100644
--- a/src/test/run-pass/reexport-should-still-link.rs
+++ b/src/test/run-pass/reexport-should-still-link.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:reexport-should-still-link.rs
+// aux-build:reexport_should_still_link.rs
 
-extern crate foo = "reexport-should-still-link";
+extern crate foo = reexport_should_still_link;
 
 pub fn main() {
     foo::bar();
diff --git a/src/test/run-pass/static-fn-inline-xc.rs b/src/test/run-pass/static-fn-inline-xc.rs
index 0d591998bc97..118ef491d9cc 100644
--- a/src/test/run-pass/static-fn-inline-xc.rs
+++ b/src/test/run-pass/static-fn-inline-xc.rs
@@ -10,7 +10,7 @@
 
 // aux-build:static_fn_inline_xc_aux.rs
 
-extern crate mycore = "static_fn_inline_xc_aux";
+extern crate mycore = static_fn_inline_xc_aux;
 
 use mycore::num;
 
diff --git a/src/test/run-pass/static-fn-trait-xc.rs b/src/test/run-pass/static-fn-trait-xc.rs
index 32a4046884dc..15642cbde7b0 100644
--- a/src/test/run-pass/static-fn-trait-xc.rs
+++ b/src/test/run-pass/static-fn-trait-xc.rs
@@ -10,7 +10,7 @@
 
 // aux-build:static_fn_trait_xc_aux.rs
 
-extern crate mycore = "static_fn_trait_xc_aux";
+extern crate mycore = static_fn_trait_xc_aux;
 
 use mycore::num;
 
diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/run-pass/static-function-pointer-xc.rs
index 8e5539ff8dca..dc1aefe5be45 100644
--- a/src/test/run-pass/static-function-pointer-xc.rs
+++ b/src/test/run-pass/static-function-pointer-xc.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:static-function-pointer-aux.rs
-extern crate aux = "static-function-pointer-aux";
+// aux-build:static_function_pointer_aux.rs
+extern crate aux = static_function_pointer_aux;
 
 fn f(x: int) -> int { x }
 
diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs
index 076c56bcc4d2..8fbcfb8c5321 100644
--- a/src/test/run-pass/static-method-xcrate.rs
+++ b/src/test/run-pass/static-method-xcrate.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:static-methods-crate.rs
+// aux-build:static_methods_crate.rs
 
 extern crate static_methods_crate;
 
diff --git a/src/test/run-pass/svh-add-comment.rs b/src/test/run-pass/svh-add-comment.rs
index bc9a371edf7c..154ce438aac7 100644
--- a/src/test/run-pass/svh-add-comment.rs
+++ b/src/test/run-pass/svh-add-comment.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-comment.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_comment.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/svh-add-doc.rs b/src/test/run-pass/svh-add-doc.rs
index 6599e493d25a..613fa4ab9157 100644
--- a/src/test/run-pass/svh-add-doc.rs
+++ b/src/test/run-pass/svh-add-doc.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-doc.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_doc.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/svh-add-macro.rs b/src/test/run-pass/svh-add-macro.rs
index f4bfe3d8c7c9..5ca9acb7435c 100644
--- a/src/test/run-pass/svh-add-macro.rs
+++ b/src/test/run-pass/svh-add-macro.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-macro.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_macro.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/run-pass/svh-add-nothing.rs
index 7f702bd7ab55..52191fb4a4ed 100644
--- a/src/test/run-pass/svh-add-nothing.rs
+++ b/src/test/run-pass/svh-add-nothing.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-no-change.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_no_change.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/svh-add-redundant-cfg.rs b/src/test/run-pass/svh-add-redundant-cfg.rs
index b5a84843a545..2beaec154043 100644
--- a/src/test/run-pass/svh-add-redundant-cfg.rs
+++ b/src/test/run-pass/svh-add-redundant-cfg.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-redundant-cfg.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_redundant_cfg.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/svh-add-whitespace.rs b/src/test/run-pass/svh-add-whitespace.rs
index 4a8058c96643..43d6b2a08a79 100644
--- a/src/test/run-pass/svh-add-whitespace.rs
+++ b/src/test/run-pass/svh-add-whitespace.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // note that these aux-build directives must be in this order
-// aux-build:svh-a-base.rs
-// aux-build:svh-b.rs
-// aux-build:svh-a-whitespace.rs
+// aux-build:svh_a_base.rs
+// aux-build:svh_b.rs
+// aux-build:svh_a_whitespace.rs
 
 #![feature(macro_rules)]
 
diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/run-pass/trait-default-method-xc-2.rs
index 9e4a7c4be971..9d36c19f099a 100644
--- a/src/test/run-pass/trait-default-method-xc-2.rs
+++ b/src/test/run-pass/trait-default-method-xc-2.rs
@@ -12,8 +12,8 @@
 // aux-build:trait_default_method_xc_aux_2.rs
 
 
-extern crate aux = "trait_default_method_xc_aux";
-extern crate aux2 = "trait_default_method_xc_aux_2";
+extern crate aux = trait_default_method_xc_aux;
+extern crate aux2 = trait_default_method_xc_aux_2;
 use aux::A;
 use aux2::{a_struct, welp};
 
diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/run-pass/trait-default-method-xc.rs
index 27db6d2f3b84..40b66fe89ba3 100644
--- a/src/test/run-pass/trait-default-method-xc.rs
+++ b/src/test/run-pass/trait-default-method-xc.rs
@@ -10,7 +10,7 @@
 
 // aux-build:trait_default_method_xc_aux.rs
 
-extern crate aux = "trait_default_method_xc_aux";
+extern crate aux = trait_default_method_xc_aux;
 use aux::{A, TestEquality, Something};
 use aux::B;
 
diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
index 5944106ad508..42ff88a12083 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs
+++ b/src/test/run-pass/trait-inheritance-auto-xc-2.rs
@@ -10,7 +10,7 @@
 
 // aux-build:trait_inheritance_auto_xc_2_aux.rs
 
-extern crate aux = "trait_inheritance_auto_xc_2_aux";
+extern crate aux = trait_inheritance_auto_xc_2_aux;
 
 // aux defines impls of Foo, Bar and Baz for A
 use aux::{Foo, Bar, Baz, A};
diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/run-pass/trait-inheritance-auto-xc.rs
index 09c58316611e..597616713c39 100644
--- a/src/test/run-pass/trait-inheritance-auto-xc.rs
+++ b/src/test/run-pass/trait-inheritance-auto-xc.rs
@@ -10,7 +10,7 @@
 
 // aux-build:trait_inheritance_auto_xc_aux.rs
 
-extern crate aux = "trait_inheritance_auto_xc_aux";
+extern crate aux = trait_inheritance_auto_xc_aux;
 
 use aux::{Foo, Bar, Baz, Quux};
 
diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
index 0afd91c58571..d4695e88b5de 100644
--- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
+++ b/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs
@@ -10,7 +10,7 @@
 
 // aux-build:trait_inheritance_cross_trait_call_xc_aux.rs
 
-extern crate aux = "trait_inheritance_cross_trait_call_xc_aux";
+extern crate aux = trait_inheritance_cross_trait_call_xc_aux;
 
 use aux::Foo;
 
diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/run-pass/typeid-intrinsic.rs
index 90f0767534bb..23ab3d438d3d 100644
--- a/src/test/run-pass/typeid-intrinsic.rs
+++ b/src/test/run-pass/typeid-intrinsic.rs
@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:typeid-intrinsic.rs
-// aux-build:typeid-intrinsic2.rs
+// aux-build:typeid_intrinsic.rs
+// aux-build:typeid_intrinsic2.rs
 
-extern crate other1 = "typeid-intrinsic";
-extern crate other2 = "typeid-intrinsic2";
+extern crate other1 = typeid_intrinsic;
+extern crate other2 = typeid_intrinsic2;
 
 use std::hash;
 use std::intrinsics;
diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/run-pass/use-crate-name-alias.rs
index bf9c5838de8f..1aaf43f0df72 100644
--- a/src/test/run-pass/use-crate-name-alias.rs
+++ b/src/test/run-pass/use-crate-name-alias.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // Issue #1706
-extern crate stdlib = "std";
+extern crate stdlib = std;
 
 pub fn main() {}
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index c42f392d2bce..e021e3bc23b7 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -14,8 +14,8 @@
 
 #![no_std]
 extern crate std;
-extern crate zed = "std";
-extern crate bar = "std#0.11.0-pre";
+extern crate zed = std;
+extern crate bar = std;
 
 
 use std::str;
diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/run-pass/weak-lang-item.rs
index 889259b6acd0..53b81e74a525 100644
--- a/src/test/run-pass/weak-lang-item.rs
+++ b/src/test/run-pass/weak-lang-item.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:weak-lang-items.rs
+// aux-build:weak_lang_items.rs
 
-extern crate other = "weak-lang-items";
+extern crate other = weak_lang_items;
 
 use std::task;
 
diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/run-pass/xcrate-address-insignificant.rs
index ddb83dedcc0f..94e707f2904b 100644
--- a/src/test/run-pass/xcrate-address-insignificant.rs
+++ b/src/test/run-pass/xcrate-address-insignificant.rs
@@ -10,7 +10,7 @@
 
 // aux-build:xcrate_address_insignificant.rs
 
-extern crate foo = "xcrate_address_insignificant";
+extern crate foo = xcrate_address_insignificant;
 
 pub fn main() {
     assert_eq!(foo::foo::<f64>(), foo::bar());
diff --git a/src/test/run-pass/xcrate-trait-lifetime-param.rs b/src/test/run-pass/xcrate-trait-lifetime-param.rs
index 56d6b4eae940..f21787f1f638 100644
--- a/src/test/run-pass/xcrate-trait-lifetime-param.rs
+++ b/src/test/run-pass/xcrate-trait-lifetime-param.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// aux-build:xcrate-trait-lifetime-param.rs
+// aux-build:xcrate_trait_lifetime_param.rs
 
-extern crate other = "xcrate-trait-lifetime-param";
+extern crate other = xcrate_trait_lifetime_param;
 
 struct Reader<'a> {
     b : &'a [u8]