diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 14:33:46 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 16:10:25 -0700 |
| commit | d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e (patch) | |
| tree | 3dbfd8c87647f67e1d17c726e72b153609d7eea8 /src/test/compile-fail | |
| parent | 1c0e1a80e54a4d231e01f2bf81c8c9529afd4ba5 (diff) | |
| parent | e77db16afbe9a7180242112456c7fded48f21b6d (diff) | |
| download | rust-d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e.tar.gz rust-d3a4f362cba36a4bf0bb8f8a951ae9d6858ae73e.zip | |
rollup merge of #23786: alexcrichton/less-quotes
Conflicts: src/test/auxiliary/static-function-pointer-aux.rs src/test/auxiliary/trait_default_method_xc_aux.rs src/test/run-pass/issue-4545.rs
Diffstat (limited to 'src/test/compile-fail')
| -rw-r--r-- | src/test/compile-fail/bad-crate-id.rs | 14 | ||||
| -rw-r--r-- | src/test/compile-fail/bad-crate-id2.rs | 14 | ||||
| -rw-r--r-- | src/test/compile-fail/use-meta-mismatch.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/weak-lang-item.rs | 2 |
4 files changed, 2 insertions, 30 deletions
diff --git a/src/test/compile-fail/bad-crate-id.rs b/src/test/compile-fail/bad-crate-id.rs deleted file mode 100644 index 193666f8269..00000000000 --- a/src/test/compile-fail/bad-crate-id.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 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. - -extern crate "" as foo; //~ ERROR: crate name must not be empty -//~^ WARNING: obsolete syntax - -fn main() {} diff --git a/src/test/compile-fail/bad-crate-id2.rs b/src/test/compile-fail/bad-crate-id2.rs deleted file mode 100644 index 29df0fa705e..00000000000 --- a/src/test/compile-fail/bad-crate-id2.rs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 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. - -extern crate "#a" as bar; //~ ERROR: invalid character `#` in crate name: `#a` -//~^ WARNING: obsolete syntax - -fn main() {} diff --git a/src/test/compile-fail/use-meta-mismatch.rs b/src/test/compile-fail/use-meta-mismatch.rs index 808deea226b..6b7b9c89149 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 "fake-crate" as extra; +extern crate fake_crate as extra; fn main() { } diff --git a/src/test/compile-fail/weak-lang-item.rs b/src/test/compile-fail/weak-lang-item.rs index 42df43934a8..708d56442fe 100644 --- a/src/test/compile-fail/weak-lang-item.rs +++ b/src/test/compile-fail/weak-lang-item.rs @@ -17,4 +17,4 @@ #![no_std] extern crate core; -extern crate "weak-lang-items" as other; +extern crate weak_lang_items; |