diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index a398bcc973746..2e094a8898206 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -313,6 +313,7 @@ impl<'a> Builder<'a> {
test::RunPassFullDepsPretty, test::RunFailFullDepsPretty,
test::Crate, test::CrateLibrustc, test::CrateRustdoc, test::Linkcheck,
test::Cargotest, test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck,
+ test::RunMakeFullDeps,
test::Nomicon, test::Reference, test::RustdocBook, test::RustByExample,
test::TheBook, test::UnstableBook,
test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme,
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 86263c8fa0733..2640248373c3d 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -915,7 +915,7 @@ impl Step for Assemble {
}
}
- let lld_install = if build.config.lld_enabled && target_compiler.stage > 0 {
+ let lld_install = if build.config.lld_enabled {
Some(builder.ensure(native::Lld {
target: target_compiler.host,
}))
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index de938ec8e8306..6c19da4648a29 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -759,12 +759,18 @@ test!(RunFailFullDepsPretty {
host: true
});
-host_test!(RunMake {
+default_test!(RunMake {
path: "src/test/run-make",
mode: "run-make",
suite: "run-make"
});
+host_test!(RunMakeFullDeps {
+ path: "src/test/run-make-fulldeps",
+ mode: "run-make",
+ suite: "run-make-fulldeps"
+});
+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
struct Compiletest {
compiler: Compiler,
@@ -827,8 +833,7 @@ impl Step for Compiletest {
// FIXME: Does pretty need librustc compiled? Note that there are
// fulldeps test suites with mode = pretty as well.
mode == "pretty" ||
- mode == "rustdoc" ||
- mode == "run-make" {
+ mode == "rustdoc" {
builder.ensure(compile::Rustc { compiler, target });
}
@@ -849,7 +854,7 @@ impl Step for Compiletest {
cmd.arg("--rustc-path").arg(builder.rustc(compiler));
// Avoid depending on rustdoc when we don't need it.
- if mode == "rustdoc" || mode == "run-make" {
+ if mode == "rustdoc" || (mode == "run-make" && suite.ends_with("fulldeps")) {
cmd.arg("--rustdoc-path").arg(builder.rustdoc(compiler.host));
}
@@ -931,7 +936,7 @@ impl Step for Compiletest {
// Only pass correct values for these flags for the `run-make` suite as it
// requires that a C++ compiler was configured which isn't always the case.
- if suite == "run-make" {
+ if suite == "run-make-fulldeps" {
let llvm_components = output(Command::new(&llvm_config).arg("--components"));
let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags"));
cmd.arg("--cc").arg(build.cc(target))
@@ -944,12 +949,12 @@ impl Step for Compiletest {
}
}
}
- if suite == "run-make" && !build.config.llvm_enabled {
+ if suite == "run-make-fulldeps" && !build.config.llvm_enabled {
println!("Ignoring run-make test suite as they generally don't work without LLVM");
return;
}
- if suite != "run-make" {
+ if suite != "run-make-fulldeps" {
cmd.arg("--cc").arg("")
.arg("--cxx").arg("")
.arg("--cflags").arg("")
diff --git a/src/ci/docker/wasm32-unknown/Dockerfile b/src/ci/docker/wasm32-unknown/Dockerfile
index 0972eb85191a9..6c0ec1ad9d4e1 100644
--- a/src/ci/docker/wasm32-unknown/Dockerfile
+++ b/src/ci/docker/wasm32-unknown/Dockerfile
@@ -26,6 +26,7 @@ ENV RUST_CONFIGURE_ARGS \
--set rust.lld
ENV SCRIPT python2.7 /checkout/x.py test --target $TARGETS \
+ src/test/run-make \
src/test/ui \
src/test/run-pass \
src/test/compile-fail \
diff --git a/src/doc/rustdoc/src/SUMMARY.md b/src/doc/rustdoc/src/SUMMARY.md
index 6315cb81a8495..46528187c1175 100644
--- a/src/doc/rustdoc/src/SUMMARY.md
+++ b/src/doc/rustdoc/src/SUMMARY.md
@@ -5,3 +5,4 @@
- [The `#[doc]` attribute](the-doc-attribute.md)
- [Documentation tests](documentation-tests.md)
- [Passes](passes.md)
+- [Unstable features](unstable-features.md)
diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
new file mode 100644
index 0000000000000..16356c20c7069
--- /dev/null
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -0,0 +1,362 @@
+# Unstable features
+
+Rustdoc is under active developement, and like the Rust compiler, some features are only available
+on the nightly releases. Some of these are new and need some more testing before they're able to get
+released to the world at large, and some of them are tied to features in the Rust compiler that are
+themselves unstable. Several features here require a matching `#![feature(...)]` attribute to
+enable, and thus are more fully documented in the [Unstable Book]. Those sections will link over
+there as necessary.
+
+[Unstable Book]: ../unstable-book/index.html
+
+## Nightly-gated functionality
+
+These features just require a nightly build to operate. Unlike the other features on this page,
+these don't need to be "turned on" with a command-line flag or a `#![feature(...)]` attribute in
+your crate. This can give them some subtle fallback modes when used on a stable release, so be
+careful!
+
+### Error numbers for `compile-fail` doctests
+
+As detailed in [the chapter on documentation tests][doctest-attributes], you can add a
+`compile_fail` attribute to a doctest to state that the test should fail to compile. However, on
+nightly, you can optionally add an error number to state that a doctest should emit a specific error
+number:
+
+[doctest-attributes]: documentation-tests.html#attributes
+
+``````markdown
+```compile_fail,E0044
+extern { fn some_func<T>(x: T); }
+```
+``````
+
+This is used by the error index to ensure that the samples that correspond to a given error number
+properly emit that error code. However, these error codes aren't guaranteed to be the only thing
+that a piece of code emits from version to version, so this is unlikely to be stabilized in the
+future.
+
+Attempting to use these error numbers on stable will result in the code sample being interpreted as
+plain text.
+
+### Linking to items by type
+
+As designed in [RFC 1946], Rustdoc can parse paths to items when you use them as links. To resolve
+these type names, it uses the items currently in-scope, either by declaration or by `use` statement.
+For modules, the "active scope" depends on whether the documentation is written outside the module
+(as `///` comments on the `mod` statement) or inside the module (at `//!` comments inside the file
+or block). For all other items, it uses the enclosing module's scope.
+
+[RFC 1946]: https://github.com/rust-lang/rfcs/pull/1946
+
+For example, in the following code:
+
+```rust
+/// Does the thing.
+pub fn do_the_thing(_: SomeType) {
+ println!("Let's do the thing!");
+}
+
+/// Token you use to [`do_the_thing`].
+pub struct SomeType;
+```
+
+The link to ``[`do_the_thing`]`` in `SomeType`'s docs will properly link to the page for `fn
+do_the_thing`. Note that here, rustdoc will insert the link target for you, but manually writing the
+target out also works:
+
+```rust
+pub mod some_module {
+ /// Token you use to do the thing.
+ pub struct SomeStruct;
+}
+
+/// Does the thing. Requires one [`SomeStruct`] for the thing to work.
+///
+/// [`SomeStruct`]: some_module::SomeStruct
+pub fn do_the_thing(_: some_module::SomeStruct) {
+ println!("Let's do the thing!");
+}
+```
+
+For more details, check out [the RFC][RFC 1946], and see [the tracking issue][43466] for more
+information about what parts of the feature are available.
+
+[43466]: https://github.com/rust-lang/rust/issues/43466
+
+## Extensions to the `#[doc]` attribute
+
+These features operate by extending the `#[doc]` attribute, and thus can be caught by the compiler
+and enabled with a `#![feature(...)]` attribute in your crate.
+
+### Documenting platform-/feature-specific information
+
+Because of the way Rustdoc documents a crate, the documentation it creates is specific to the target
+rustc compiles for. Anything that's specific to any other target is dropped via `#[cfg]` attribute
+processing early in the compilation process. However, Rustdoc has a trick up its sleeve to handle
+platform-specific code if it *does* receive it.
+
+Because Rustdoc doesn't need to fully compile a crate to binary, it replaces function bodies with
+`loop {}` to prevent having to process more than necessary. This means that any code within a
+function that requires platform-specific pieces is ignored. Combined with a special attribute,
+`#[doc(cfg(...))]`, you can tell Rustdoc exactly which platform something is supposed to run on,
+ensuring that doctests are only run on the appropriate platforms.
+
+The `#[doc(cfg(...))]` attribute has another effect: When Rustdoc renders documentation for that
+item, it will be accompanied by a banner explaining that the item is only available on certain
+platforms.
+
+As mentioned earlier, getting the items to Rustdoc requires some extra preparation. The standard
+library adds a `--cfg dox` flag to every Rustdoc command, but the same thing can be accomplished by
+adding a feature to your Cargo.toml and adding `--feature dox` (or whatever you choose to name the
+feature) to your `cargo doc` calls.
+
+Either way, once you create an environment for the documentation, you can start to augment your
+`#[cfg]` attributes to allow both the target platform *and* the documentation configuration to leave
+the item in. For example, `#[cfg(any(windows, feature = "dox"))]` will preserve the item either on
+Windows or during the documentation process. Then, adding a new attribute `#[doc(cfg(windows))]`
+will tell Rustdoc that the item is supposed to be used on Windows. For example:
+
+```rust
+#![feature(doc_cfg)]
+
+/// Token struct that can only be used on Windows.
+#[cfg(any(windows, feature = "dox"))]
+#[doc(cfg(windows))]
+pub struct WindowsToken;
+
+/// Token struct that can only be used on Unix.
+#[cfg(any(unix, feature = "dox"))]
+#[doc(cfg(unix))]
+pub struct UnixToken;
+```
+
+In this sample, the tokens will only appear on their respective platforms, but they will both appear
+in documentation.
+
+`#[doc(cfg(...))]` was introduced to be used by the standard library and currently requires the
+`#![feature(doc_cfg)]` feature gate. For more information, see [its chapter in the Unstable
+Book][unstable-doc-cfg] and [its tracking issue][issue-doc-cfg].
+
+[unstable-doc-cfg]: ../unstable-book/language-features/doc-cfg.html
+[issue-doc-cfg]: https://github.com/rust-lang/rust/issues/43781
+
+### Adding your trait to the "Important Traits" dialog
+
+Rustdoc keeps a list of a few traits that are believed to be "fundamental" to a given type when
+implemented on it. These traits are intended to be the primary interface for their types, and are
+often the only thing available to be documented on their types. For this reason, Rustdoc will track
+when a given type implements one of these traits and call special attention to it when a function
+returns one of these types. This is the "Important Traits" dialog, visible as a circle-i button next
+to the function, which, when clicked, shows the dialog.
+
+In the standard library, the traits that qualify for inclusion are `Iterator`, `io::Read`, and
+`io::Write`. However, rather than being implemented as a hard-coded list, these traits have a
+special marker attribute on them: `#[doc(spotlight)]`. This means that you could apply this
+attribute to your own trait to include it in the "Important Traits" dialog in documentation.
+
+The `#[doc(spotlight)]` attribute currently requires the `#![feature(doc_spotlight)]` feature gate.
+For more information, see [its chapter in the Unstable Book][unstable-spotlight] and [its tracking
+issue][issue-spotlight].
+
+[unstable-spotlight]: ../unstable-book/language-features/doc-spotlight.html
+[issue-spotlight]: https://github.com/rust-lang/rust/issues/45040
+
+### Exclude certain dependencies from documentation
+
+The standard library uses several dependencies which, in turn, use several types and traits from the
+standard library. In addition, there are several compiler-internal crates that are not considered to
+be part of the official standard library, and thus would be a distraction to include in
+documentation. It's not enough to exclude their crate documentation, since information about trait
+implementations appears on the pages for both the type and the trait, which can be in different
+crates!
+
+To prevent internal types from being included in documentation, the standard library adds an
+attribute to their `extern crate` declarations: `#[doc(masked)]`. This causes Rustdoc to "mask out"
+types from these crates when building lists of trait implementations.
+
+The `#[doc(masked)]` attribute is intended to be used internally, and requires the
+`#![feature(doc_masked)]` feature gate. For more information, see [its chapter in the Unstable
+Book][unstable-masked] and [its tracking issue][issue-masked].
+
+[unstable-masked]: ../unstable-book/language-features/doc-masked.html
+[issue-masked]: https://github.com/rust-lang/rust/issues/44027
+
+### Include external files as API documentation
+
+As designed in [RFC 1990], Rustdoc can read an external file to use as a type's documentation. This
+is useful if certain documentation is so long that it would break the flow of reading the source.
+Instead of writing it all inline, writing `#[doc(include = "sometype.md")]` (where `sometype.md` is
+a file adjacent to the `lib.rs` for the crate) will ask Rustdoc to instead read that file and use it
+as if it were written inline.
+
+[RFC 1990]: https://github.com/rust-lang/rfcs/pull/1990
+
+`#[doc(include = "...")]` currently requires the `#![feature(external_doc)]` feature gate. For more
+information, see [its chapter in the Unstable Book][unstable-include] and [its tracking
+issue][issue-include].
+
+[unstable-include]: ../unstable-book/language-features/external-doc.html
+[issue-include]: https://github.com/rust-lang/rust/issues/44732
+
+## Unstable command-line arguments
+
+These features are enabled by passing a command-line flag to Rustdoc, but the flags in question are
+themselves marked as unstable. To use any of these options, pass `-Z unstable-options` as well as
+the flag in question to Rustdoc on the command-line. To do this from Cargo, you can either use the
+`RUSTDOCFLAGS` environment variable or the `cargo rustdoc` command.
+
+### `--markdown-before-content`: include rendered Markdown before the content
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --markdown-before-content extra.md
+$ rustdoc README.md -Z unstable-options --markdown-before-content extra.md
+```
+
+Just like `--html-before-content`, this allows you to insert extra content inside the `<body>` tag
+but before the other content `rustdoc` would normally produce in the rendered documentation.
+However, instead of directly inserting the file verbatim, `rustdoc` will pass the files through a
+Markdown renderer before inserting the result into the file.
+
+### `--markdown-after-content`: include rendered Markdown after the content
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --markdown-after-content extra.md
+$ rustdoc README.md -Z unstable-options --markdown-after-content extra.md
+```
+
+Just like `--html-after-content`, this allows you to insert extra content before the `</body>` tag
+but after the other content `rustdoc` would normally produce in the rendered documentation.
+However, instead of directly inserting the file verbatim, `rustdoc` will pass the files through a
+Markdown renderer before inserting the result into the file.
+
+### `--playground-url`: control the location of the playground
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --playground-url https://play.rust-lang.org/
+```
+
+When rendering a crate's docs, this flag gives the base URL of the Rust Playground, to use for
+generating `Run` buttons. Unlike `--markdown-playground-url`, this argument works for standalone
+Markdown files *and* Rust crates. This works the same way as adding `#![doc(html_playground_url =
+"url")]` to your crate root, as mentioned in [the chapter about the `#[doc]`
+attribute][doc-playground]. Please be aware that the official Rust Playground at
+https://play.rust-lang.org does not have every crate available, so if your examples require your
+crate, make sure the playground you provide has your crate available.
+
+[doc-playground]: the-doc-attribute.html#html_playground_url
+
+If both `--playground-url` and `--markdown-playground-url` are present when rendering a standalone
+Markdown file, the URL given to `--markdown-playground-url` will take precedence. If both
+`--playground-url` and `#![doc(html_playground_url = "url")]` are present when rendering crate docs,
+the attribute will take precedence.
+
+### `--crate-version`: control the crate version
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --crate-version 1.3.37
+```
+
+When `rustdoc` receives this flag, it will print an extra "Version (version)" into the sidebar of
+the crate root's docs. You can use this flag to differentiate between different versions of your
+library's documentation.
+
+### `--linker`: control the linker used for documentation tests
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc --test src/lib.rs -Z unstable-options --linker foo
+$ rustdoc --test README.md -Z unstable-options --linker foo
+```
+
+When `rustdoc` runs your documentation tests, it needs to compile and link the tests as executables
+before running them. This flag can be used to change the linker used on these executables. It's
+equivalent to passing `-C linker=foo` to `rustc`.
+
+### `--sort-modules-by-appearance`: control how items on module pages are sorted
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --sort-modules-by-appearance
+```
+
+Ordinarily, when `rustdoc` prints items in module pages, it will sort them alphabetically (taking
+some consideration for their stability, and names that end in a number). Giving this flag to
+`rustdoc` will disable this sorting and instead make it print the items in the order they appear in
+the source.
+
+### `--themes`: provide additional themes
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --themes theme.css
+```
+
+Giving this flag to `rustdoc` will make it copy your theme into the generated crate docs and enable
+it in the theme selector. Note that `rustdoc` will reject your theme file if it doesn't style
+everything the "main" theme does. See `--theme-checker` below for details.
+
+### `--theme-checker`: verify theme CSS for validity
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc -Z unstable-options --theme-checker theme.css
+```
+
+Before including your theme in crate docs, `rustdoc` will compare all the CSS rules it contains
+against the "main" theme included by default. Using this flag will allow you to see which rules are
+missing if `rustdoc` rejects your theme.
+
+### `--resource-suffix`: modifying the name of CSS/JavaScript in crate docs
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --resource-suffix suf
+```
+
+When rendering docs, `rustdoc` creates several CSS and JavaScript files as part of the output. Since
+all these files are linked from every page, changing where they are can be cumbersome if you need to
+specially cache them. This flag will rename all these files in the output to include the suffix in
+the filename. For example, `main.css` would become `main-suf.css` with the above command.
+
+### `--display-warnings`: display warnings when documenting or running documentation tests
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z unstable-options --display-warnings
+$ rustdoc --test src/lib.rs -Z unstable-options --display-warnings
+```
+
+The intent behind this flag is to allow the user to see warnings that occur within their library or
+their documentation tests, which are usually suppressed. However, [due to a
+bug][issue-display-warnings], this flag doesn't 100% work as intended. See the linked issue for
+details.
+
+[issue-display-warnings]: https://github.com/rust-lang/rust/issues/41574
+
+### `-Z force-unstable-if-unmarked`
+
+Using this flag looks like this:
+
+```bash
+$ rustdoc src/lib.rs -Z force-unstable-if-unmarked
+```
+
+This is an internal flag intended for the standard library and compiler that applies an
+`#[unstable]` attribute to any dependent crate that doesn't have another stability attribute. This
+allows `rustdoc` to be able to generate documentation for the compiler crates and the standard
+library, as an equivalent command-line argument is provided to `rustc` when building those crates.
diff --git a/src/etc/cat-and-grep.sh b/src/etc/cat-and-grep.sh
index ef9884d2e980d..361e8d8e60eed 100755
--- a/src/etc/cat-and-grep.sh
+++ b/src/etc/cat-and-grep.sh
@@ -63,6 +63,11 @@ done
shift $((OPTIND - 1))
+# use gnu version of tool if available (for bsd)
+if command -v "g${GREPPER}"; then
+ GREPPER="g${GREPPER}"
+fi
+
LOG=$(mktemp -t cgrep.XXXXXX)
trap "rm -f $LOG" EXIT
diff --git a/src/liballoc/btree/node.rs b/src/liballoc/btree/node.rs
index c1618043ce66f..464f8f2f4eced 100644
--- a/src/liballoc/btree/node.rs
+++ b/src/liballoc/btree/node.rs
@@ -43,8 +43,7 @@
use core::marker::PhantomData;
use core::mem;
-use core::nonzero::NonZero;
-use core::ptr::{self, Unique};
+use core::ptr::{self, Unique, NonNull};
use core::slice;
use boxed::Box;
@@ -149,14 +148,12 @@ impl<K, V> BoxedNode<K, V> {
}
}
- unsafe fn from_ptr(ptr: NonZero<*const LeafNode<K, V>>) -> Self {
- BoxedNode { ptr: Unique::new_unchecked(ptr.get() as *mut LeafNode<K, V>) }
+ unsafe fn from_ptr(ptr: NonNull<LeafNode<K, V>>) -> Self {
+ BoxedNode { ptr: Unique::from(ptr) }
}
- fn as_ptr(&self) -> NonZero<*const LeafNode<K, V>> {
- unsafe {
- NonZero::from(self.ptr.as_ref())
- }
+ fn as_ptr(&self) -> NonNull<LeafNode<K, V>> {
+ NonNull::from(self.ptr)
}
}
@@ -276,7 +273,7 @@ impl<K, V> Root<K, V> {
/// `NodeRef` could be pointing to either type of node.
pub struct NodeRef<BorrowType, K, V, Type> {
height: usize,
- node: NonZero<*const LeafNode<K, V>>,
+ node: NonNull<LeafNode<K, V>>,
// This is null unless the borrow type is `Mut`
root: *const Root<K, V>,
_marker: PhantomData<(BorrowType, Type)>
@@ -302,7 +299,7 @@ unsafe impl<K: Send, V: Send, Type> Send
impl<BorrowType, K, V> NodeRef<BorrowType, K, V, marker::Internal> {
fn as_internal(&self) -> &InternalNode<K, V> {
unsafe {
- &*(self.node.get() as *const InternalNode<K, V>)
+ &*(self.node.as_ptr() as *mut InternalNode<K, V>)
}
}
}
@@ -310,7 +307,7 @@ impl<BorrowType, K, V> NodeRef<BorrowType, K, V, marker::Internal> {
impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
fn as_internal_mut(&mut self) -> &mut InternalNode<K, V> {
unsafe {
- &mut *(self.node.get() as *mut InternalNode<K, V>)
+ &mut *(self.node.as_ptr() as *mut InternalNode<K, V>)
}
}
}
@@ -352,7 +349,7 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
fn as_leaf(&self) -> &LeafNode<K, V> {
unsafe {
- &*self.node.get()
+ self.node.as_ref()
}
}
@@ -382,7 +379,8 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
>,
Self
> {
- if let Some(non_zero) = NonZero::new(self.as_leaf().parent as *const LeafNode<K, V>) {
+ let parent_as_leaf = self.as_leaf().parent as *const LeafNode<K, V>;
+ if let Some(non_zero) = NonNull::new(parent_as_leaf as *mut _) {
Ok(Handle {
node: NodeRef {
height: self.height + 1,
@@ -498,7 +496,7 @@ impl<'a, K, V, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
fn as_leaf_mut(&mut self) -> &mut LeafNode<K, V> {
unsafe {
- &mut *(self.node.get() as *mut LeafNode<K, V>)
+ self.node.as_mut()
}
}
@@ -1241,12 +1239,12 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
}
Heap.dealloc(
- right_node.node.get() as *mut u8,
+ right_node.node.as_ptr() as *mut u8,
Layout::new::<InternalNode<K, V>>(),
);
} else {
Heap.dealloc(
- right_node.node.get() as *mut u8,
+ right_node.node.as_ptr() as *mut u8,
Layout::new::<LeafNode<K, V>>(),
);
}
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs
index 36618e86968b5..c8ee166fee3e9 100644
--- a/src/libcore/cell.rs
+++ b/src/libcore/cell.rs
@@ -146,13 +146,12 @@
//!
//! ```
//! #![feature(core_intrinsics)]
-//! #![feature(shared)]
//! use std::cell::Cell;
-//! use std::ptr::Shared;
+//! use std::ptr::NonNull;
//! use std::intrinsics::abort;
//!
//! struct Rc<T: ?Sized> {
-//! ptr: Shared<RcBox<T>>
+//! ptr: NonNull<RcBox<T>>
//! }
//!
//! struct RcBox<T: ?Sized> {
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
index fcf06ea319d43..427765aed208a 100644
--- a/src/libcore/fmt/num.rs
+++ b/src/libcore/fmt/num.rs
@@ -105,10 +105,6 @@ struct Binary;
#[derive(Clone, PartialEq)]
struct Octal;
-/// A decimal (base 10) radix
-#[derive(Clone, PartialEq)]
-struct Decimal;
-
/// A hexadecimal (base 16) radix, formatted with lower-case characters
#[derive(Clone, PartialEq)]
struct LowerHex;
@@ -134,7 +130,6 @@ macro_rules! radix {
radix! { Binary, 2, "0b", x @ 0 ... 1 => b'0' + x }
radix! { Octal, 8, "0o", x @ 0 ... 7 => b'0' + x }
-radix! { Decimal, 10, "", x @ 0 ... 9 => b'0' + x }
radix! { LowerHex, 16, "0x", x @ 0 ... 9 => b'0' + x,
x @ 10 ... 15 => b'a' + (x - 10) }
radix! { UpperHex, 16, "0x", x @ 0 ... 9 => b'0' + x,
diff --git a/src/libcore/nonzero.rs b/src/libcore/nonzero.rs
index 2c966eb3b5794..19836d98844e2 100644
--- a/src/libcore/nonzero.rs
+++ b/src/libcore/nonzero.rs
@@ -9,9 +9,10 @@
// except according to those terms.
//! Exposes the NonZero lang item which provides optimization hints.
-#![unstable(feature = "nonzero",
- reason = "needs an RFC to flesh out the design",
- issue = "27730")]
+#![unstable(feature = "nonzero", reason = "deprecated", issue = "49137")]
+#![rustc_deprecated(reason = "use `std::ptr::NonNull` or `std::num::NonZero*` instead",
+ since = "1.26.0")]
+#![allow(deprecated)]
use ops::CoerceUnsized;
@@ -62,14 +63,11 @@ impl_zeroable_for_integer_types! {
/// NULL or 0 that might allow certain optimizations.
#[lang = "non_zero"]
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash)]
-pub struct NonZero<T: Zeroable>(T);
+pub struct NonZero<T: Zeroable>(pub(crate) T);
impl<T: Zeroable> NonZero<T> {
/// Creates an instance of NonZero with the provided value.
/// You must indeed ensure that the value is actually "non-zero".
- #[unstable(feature = "nonzero",
- reason = "needs an RFC to flesh out the design",
- issue = "27730")]
#[inline]
pub const unsafe fn new_unchecked(inner: T) -> Self {
NonZero(inner)
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 4583e45bb12eb..18e0aa453d8df 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -15,9 +15,98 @@
use convert::TryFrom;
use fmt;
use intrinsics;
+#[allow(deprecated)] use nonzero::NonZero;
use ops;
use str::FromStr;
+macro_rules! impl_nonzero_fmt {
+ ( #[$stability: meta] ( $( $Trait: ident ),+ ) for $Ty: ident ) => {
+ $(
+ #[$stability]
+ impl fmt::$Trait for $Ty {
+ #[inline]
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ self.get().fmt(f)
+ }
+ }
+ )+
+ }
+}
+
+macro_rules! nonzero_integers {
+ ( #[$stability: meta] $( $Ty: ident($Int: ty); )+ ) => {
+ $(
+ /// An integer that is known not to equal zero.
+ ///
+ /// This may enable some memory layout optimization such as:
+ ///
+ /// ```rust
+ /// # #![feature(nonzero)]
+ /// use std::mem::size_of;
+ /// assert_eq!(size_of::<Option<std::num::NonZeroU32>>(), size_of::<u32>());
+ /// ```
+ #[$stability]
+ #[allow(deprecated)]
+ #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+ pub struct $Ty(NonZero<$Int>);
+
+ #[allow(deprecated)]
+ impl $Ty {
+ /// Create a non-zero without checking the value.
+ ///
+ /// # Safety
+ ///
+ /// The value must not be zero.
+ #[$stability]
+ #[inline]
+ pub const unsafe fn new_unchecked(n: $Int) -> Self {
+ $Ty(NonZero(n))
+ }
+
+ /// Create a non-zero if the given value is not zero.
+ #[$stability]
+ #[inline]
+ pub fn new(n: $Int) -> Option<Self> {
+ if n != 0 {
+ Some($Ty(NonZero(n)))
+ } else {
+ None
+ }
+ }
+
+ /// Returns the value as a primitive type.
+ #[$stability]
+ #[inline]
+ pub fn get(self) -> $Int {
+ self.0 .0
+ }
+
+ }
+
+ impl_nonzero_fmt! {
+ #[$stability]
+ (Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty
+ }
+ )+
+ }
+}
+
+nonzero_integers! {
+ #[unstable(feature = "nonzero", issue = "49137")]
+ NonZeroU8(u8); NonZeroI8(i8);
+ NonZeroU16(u16); NonZeroI16(i16);
+ NonZeroU32(u32); NonZeroI32(i32);
+ NonZeroU64(u64); NonZeroI64(i64);
+ NonZeroUsize(usize); NonZeroIsize(isize);
+}
+
+nonzero_integers! {
+ // Change this to `#[unstable(feature = "i128", issue = "35118")]`
+ // if other NonZero* integer types are stabilizied before 128-bit integers
+ #[unstable(feature = "nonzero", issue = "49137")]
+ NonZeroU128(u128); NonZeroI128(i128);
+}
+
/// Provides intentionally-wrapped arithmetic on `T`.
///
/// Operations like `+` on `u32` values is intended to never overflow,
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 6270e5892b3a0..cebd5989e96cd 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -23,7 +23,7 @@ use fmt;
use hash;
use marker::{PhantomData, Unsize};
use mem;
-use nonzero::NonZero;
+#[allow(deprecated)] use nonzero::NonZero;
use cmp::Ordering::{self, Less, Equal, Greater};
@@ -2285,6 +2285,7 @@ impl<T: ?Sized> PartialOrd for *mut T {
#[unstable(feature = "ptr_internals", issue = "0",
reason = "use NonNull instead and consider PhantomData<T> \
(if you also use #[may_dangle]), Send, and/or Sync")]
+#[allow(deprecated)]
pub struct Unique<T: ?Sized> {
pointer: NonZero<*const T>,
// NOTE: this marker has no consequences for variance, but is necessary
@@ -2332,6 +2333,7 @@ impl<T: Sized> Unique<T> {
}
#[unstable(feature = "ptr_internals", issue = "0")]
+#[allow(deprecated)]
impl<T: ?Sized> Unique<T> {
/// Creates a new `Unique`.
///
@@ -2339,17 +2341,21 @@ impl<T: ?Sized> Unique<T> {
///
/// `ptr` must be non-null.
pub const unsafe fn new_unchecked(ptr: *mut T) -> Self {
- Unique { pointer: NonZero::new_unchecked(ptr), _marker: PhantomData }
+ Unique { pointer: NonZero(ptr as _), _marker: PhantomData }
}
/// Creates a new `Unique` if `ptr` is non-null.
pub fn new(ptr: *mut T) -> Option<Self> {
- NonZero::new(ptr as *const T).map(|nz| Unique { pointer: nz, _marker: PhantomData })
+ if !ptr.is_null() {
+ Some(Unique { pointer: NonZero(ptr as _), _marker: PhantomData })
+ } else {
+ None
+ }
}
/// Acquires the underlying `*mut` pointer.
pub fn as_ptr(self) -> *mut T {
- self.pointer.get() as *mut T
+ self.pointer.0 as *mut T
}
/// Dereferences the content.
@@ -2392,16 +2398,18 @@ impl<T: ?Sized> fmt::Pointer for Unique<T> {
}
#[unstable(feature = "ptr_internals", issue = "0")]
+#[allow(deprecated)]
impl<'a, T: ?Sized> From<&'a mut T> for Unique<T> {
fn from(reference: &'a mut T) -> Self {
- Unique { pointer: NonZero::from(reference), _marker: PhantomData }
+ Unique { pointer: NonZero(reference as _), _marker: PhantomData }
}
}
#[unstable(feature = "ptr_internals", issue = "0")]
+#[allow(deprecated)]
impl<'a, T: ?Sized> From<&'a T> for Unique<T> {
fn from(reference: &'a T) -> Self {
- Unique { pointer: NonZero::from(reference), _marker: PhantomData }
+ Unique { pointer: NonZero(reference as _), _marker: PhantomData }
}
}
@@ -2412,11 +2420,6 @@ impl<'a, T: ?Sized> From<NonNull<T>> for Unique<T> {
}
}
-/// Previous name of `NonNull`.
-#[rustc_deprecated(since = "1.25.0", reason = "renamed to `NonNull`")]
-#[unstable(feature = "shared", issue = "27730")]
-pub type Shared<T> = NonNull<T>;
-
/// `*mut T` but non-zero and covariant.
///
/// This is often the correct thing to use when building data structures using
@@ -2436,7 +2439,7 @@ pub type Shared<T> = NonNull<T>;
/// provide a public API that follows the normal shared XOR mutable rules of Rust.
#[stable(feature = "nonnull", since = "1.25.0")]
pub struct NonNull<T: ?Sized> {
- pointer: NonZero<*const T>,
+ #[allow(deprecated)] pointer: NonZero<*const T>,
}
/// `NonNull` pointers are not `Send` because the data they reference may be aliased.
@@ -2463,6 +2466,7 @@ impl<T: Sized> NonNull<T> {
}
}
+#[allow(deprecated)]
impl<T: ?Sized> NonNull<T> {
/// Creates a new `NonNull`.
///
@@ -2471,19 +2475,23 @@ impl<T: ?Sized> NonNull<T> {
/// `ptr` must be non-null.
#[stable(feature = "nonnull", since = "1.25.0")]
pub const unsafe fn new_unchecked(ptr: *mut T) -> Self {
- NonNull { pointer: NonZero::new_unchecked(ptr) }
+ NonNull { pointer: NonZero(ptr as _) }
}
/// Creates a new `NonNull` if `ptr` is non-null.
#[stable(feature = "nonnull", since = "1.25.0")]
pub fn new(ptr: *mut T) -> Option<Self> {
- NonZero::new(ptr as *const T).map(|nz| NonNull { pointer: nz })
+ if !ptr.is_null() {
+ Some(NonNull { pointer: NonZero(ptr as _) })
+ } else {
+ None
+ }
}
/// Acquires the underlying `*mut` pointer.
#[stable(feature = "nonnull", since = "1.25.0")]
pub fn as_ptr(self) -> *mut T {
- self.pointer.get() as *mut T
+ self.pointer.0 as *mut T
}
/// Dereferences the content.
@@ -2581,15 +2589,17 @@ impl<T: ?Sized> From<Unique<T>> for NonNull<T> {
}
#[stable(feature = "nonnull", since = "1.25.0")]
+#[allow(deprecated)]
impl<'a, T: ?Sized> From<&'a mut T> for NonNull<T> {
fn from(reference: &'a mut T) -> Self {
- NonNull { pointer: NonZero::from(reference) }
+ NonNull { pointer: NonZero(reference as _) }
}
}
#[stable(feature = "nonnull", since = "1.25.0")]
+#[allow(deprecated)]
impl<'a, T: ?Sized> From<&'a T> for NonNull<T> {
fn from(reference: &'a T) -> Self {
- NonNull { pointer: NonZero::from(reference) }
+ NonNull { pointer: NonZero(reference as _) }
}
}
diff --git a/src/libcore/tests/nonzero.rs b/src/libcore/tests/nonzero.rs
index a795dd575043d..8d39298bac3d1 100644
--- a/src/libcore/tests/nonzero.rs
+++ b/src/libcore/tests/nonzero.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use core::nonzero::NonZero;
+use core::num::NonZeroU32;
use core::option::Option;
use core::option::Option::{Some, None};
use std::mem::size_of;
@@ -16,28 +16,28 @@ use std::mem::size_of;
#[test]
fn test_create_nonzero_instance() {
let _a = unsafe {
- NonZero::new_unchecked(21)
+ NonZeroU32::new_unchecked(21)
};
}
#[test]
fn test_size_nonzero_in_option() {
- assert_eq!(size_of::<NonZero<u32>>(), size_of::<Option<NonZero<u32>>>());
+ assert_eq!(size_of::<NonZeroU32>(), size_of::<Option<NonZeroU32>>());
}
#[test]
fn test_match_on_nonzero_option() {
let a = Some(unsafe {
- NonZero::new_unchecked(42)
+ NonZeroU32::new_unchecked(42)
});
match a {
Some(val) => assert_eq!(val.get(), 42),
- None => panic!("unexpected None while matching on Some(NonZero(_))")
+ None => panic!("unexpected None while matching on Some(NonZeroU32(_))")
}
- match unsafe { Some(NonZero::new_unchecked(43)) } {
+ match unsafe { Some(NonZeroU32::new_unchecked(43)) } {
Some(val) => assert_eq!(val.get(), 43),
- None => panic!("unexpected None while matching on Some(NonZero(_))")
+ None => panic!("unexpected None while matching on Some(NonZeroU32(_))")
}
}
@@ -98,3 +98,26 @@ fn test_match_option_string() {
None => panic!("unexpected None while matching on Some(String { ... })")
}
}
+
+mod atom {
+ use core::num::NonZeroU32;
+
+ #[derive(PartialEq, Eq)]
+ pub struct Atom {
+ index: NonZeroU32, // private
+ }
+ pub const FOO_ATOM: Atom = Atom { index: unsafe { NonZeroU32::new_unchecked(7) } };
+}
+
+macro_rules! atom {
+ ("foo") => { atom::FOO_ATOM }
+}
+
+#[test]
+fn test_match_nonzero_const_pattern() {
+ match atom!("foo") {
+ // Using as a pattern is supported by the compiler:
+ atom!("foo") => {}
+ _ => panic!("Expected the const item as a pattern to match.")
+ }
+}
diff --git a/src/libproc_macro/lib.rs b/src/libproc_macro/lib.rs
index b239f8018bebb..d6e679bad48b7 100644
--- a/src/libproc_macro/lib.rs
+++ b/src/libproc_macro/lib.rs
@@ -681,7 +681,8 @@ impl TokenTree {
Dollar => op!('$'),
Question => op!('?'),
- Ident(ident) | Lifetime(ident) => TokenNode::Term(Term(ident.name)),
+ Ident(ident, false) | Lifetime(ident) => TokenNode::Term(Term(ident.name)),
+ Ident(ident, true) => TokenNode::Term(Term(Symbol::intern(&format!("r#{}", ident)))),
Literal(..) | DocComment(..) => TokenNode::Literal(self::Literal(token)),
Interpolated(_) => {
@@ -713,8 +714,14 @@ impl TokenTree {
},
TokenNode::Term(symbol) => {
let ident = ast::Ident { name: symbol.0, ctxt: self.span.0.ctxt() };
+ let sym_str = symbol.0.as_str();
let token =
- if symbol.0.as_str().starts_with("'") { Lifetime(ident) } else { Ident(ident) };
+ if sym_str.starts_with("'") { Lifetime(ident) }
+ else if sym_str.starts_with("r#") {
+ let name = Symbol::intern(&sym_str[2..]);
+ let ident = ast::Ident { name, ctxt: self.span.0.ctxt() };
+ Ident(ident, true)
+ } else { Ident(ident, false) };
return TokenTree::Token(self.span.0, token).into();
}
TokenNode::Literal(token) => return TokenTree::Token(self.span.0, token.0).into(),
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
index 1e2e4e5a69fa1..8bcec79d99f17 100644
--- a/src/librustc/dep_graph/dep_node.rs
+++ b/src/librustc/dep_graph/dep_node.rs
@@ -593,6 +593,7 @@ define_dep_nodes!( <'tcx>
[] ImplementationsOfTrait { krate: CrateNum, trait_id: DefId },
[] AllTraitImplementations(CrateNum),
+ [] DllimportForeignItems(CrateNum),
[] IsDllimportForeignItem(DefId),
[] IsStaticallyIncludedForeignItem(DefId),
[] NativeLibraryKind(DefId),
@@ -650,9 +651,13 @@ define_dep_nodes!( <'tcx>
[] GetSymbolExportLevel(DefId),
+ [] WasmCustomSections(CrateNum),
+
[input] Features,
[] ProgramClausesFor(DefId),
+ [] WasmImportModuleMap(CrateNum),
+ [] ForeignModules(CrateNum),
);
trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> : fmt::Debug {
diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs
index d7194e9c2cabb..9b2647ad4db2b 100644
--- a/src/librustc/hir/check_attr.rs
+++ b/src/librustc/hir/check_attr.rs
@@ -25,6 +25,8 @@ enum Target {
Struct,
Union,
Enum,
+ Const,
+ ForeignMod,
Other,
}
@@ -35,6 +37,8 @@ impl Target {
hir::ItemStruct(..) => Target::Struct,
hir::ItemUnion(..) => Target::Union,
hir::ItemEnum(..) => Target::Enum,
+ hir::ItemConst(..) => Target::Const,
+ hir::ItemForeignMod(..) => Target::ForeignMod,
_ => Target::Other,
}
}
@@ -55,14 +59,42 @@ impl<'a, 'tcx> CheckAttrVisitor<'a, 'tcx> {
.emit();
}
+ let mut has_wasm_import_module = false;
for attr in &item.attrs {
- if let Some(name) = attr.name() {
- if name == "inline" {
- self.check_inline(attr, item, target)
+ if attr.check_name("inline") {
+ self.check_inline(attr, item, target)
+ } else if attr.check_name("wasm_import_module") {
+ has_wasm_import_module = true;
+ if attr.value_str().is_none() {
+ self.tcx.sess.span_err(attr.span, "\
+ must be of the form #[wasm_import_module = \"...\"]");
+ }
+ if target != Target::ForeignMod {
+ self.tcx.sess.span_err(attr.span, "\
+ must only be attached to foreign modules");
+ }
+ } else if attr.check_name("wasm_custom_section") {
+ if target != Target::Const {
+ self.tcx.sess.span_err(attr.span, "only allowed on consts");
+ }
+
+ if attr.value_str().is_none() {
+ self.tcx.sess.span_err(attr.span, "must be of the form \
+ #[wasm_custom_section = \"foo\"]");
}
}
}
+ if target == Target::ForeignMod &&
+ !has_wasm_import_module &&
+ self.tcx.sess.target.target.arch == "wasm32" &&
+ false // FIXME: eventually enable this warning when stable
+ {
+ self.tcx.sess.span_warn(item.span, "\
+ must have a #[wasm_import_module = \"...\"] attribute, this \
+ will become a hard error before too long");
+ }
+
self.check_repr(item, target);
}
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index d6810b2468bcc..12b472a728544 100644
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -395,6 +395,15 @@ pub enum TyParamBound {
RegionTyParamBound(Lifetime),
}
+impl TyParamBound {
+ pub fn span(&self) -> Span {
+ match self {
+ &TraitTyParamBound(ref t, ..) => t.span,
+ &RegionTyParamBound(ref l) => l.span,
+ }
+ }
+}
+
/// A modifier on a bound, currently this is only used for `?Sized`, where the
/// modifier is `Maybe`. Negative bounds should also be handled here.
#[derive(Copy, Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
@@ -571,6 +580,16 @@ pub enum WherePredicate {
EqPredicate(WhereEqPredicate),
}
+impl WherePredicate {
+ pub fn span(&self) -> Span {
+ match self {
+ &WherePredicate::BoundPredicate(ref p) => p.span,
+ &WherePredicate::RegionPredicate(ref p) => p.span,
+ &WherePredicate::EqPredicate(ref p) => p.span,
+ }
+ }
+}
+
/// A type bound, eg `for<'c> Foo: Send+Clone+'c`
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
pub struct WhereBoundPredicate {
diff --git a/src/librustc/ich/impls_cstore.rs b/src/librustc/ich/impls_cstore.rs
index 18a02ff5c5882..0071850e1052b 100644
--- a/src/librustc/ich/impls_cstore.rs
+++ b/src/librustc/ich/impls_cstore.rs
@@ -33,7 +33,12 @@ impl_stable_hash_for!(struct middle::cstore::NativeLibrary {
kind,
name,
cfg,
- foreign_items
+ foreign_module
+});
+
+impl_stable_hash_for!(struct middle::cstore::ForeignModule {
+ foreign_items,
+ def_id
});
impl_stable_hash_for!(enum middle::cstore::LinkagePreference {
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
index 513b6c835f982..0b037964981c9 100644
--- a/src/librustc/ich/impls_syntax.rs
+++ b/src/librustc/ich/impls_syntax.rs
@@ -318,7 +318,10 @@ fn hash_token<'a, 'gcx, W: StableHasherResult>(
opt_name.hash_stable(hcx, hasher);
}
- token::Token::Ident(ident) |
+ token::Token::Ident(ident, is_raw) => {
+ ident.name.hash_stable(hcx, hasher);
+ is_raw.hash_stable(hcx, hasher);
+ }
token::Token::Lifetime(ident) => ident.name.hash_stable(hcx, hasher),
token::Token::Interpolated(_) => {
diff --git a/src/librustc/lint/context.rs b/src/librustc/lint/context.rs
index 4fa6594df169c..3c833251f72a7 100644
--- a/src/librustc/lint/context.rs
+++ b/src/librustc/lint/context.rs
@@ -41,7 +41,7 @@ use util::nodemap::FxHashMap;
use std::default::Default as StdDefault;
use std::cell::{Ref, RefCell};
use syntax::ast;
-use syntax::epoch;
+use syntax::edition;
use syntax_pos::{MultiSpan, Span};
use errors::DiagnosticBuilder;
use hir;
@@ -103,9 +103,9 @@ pub struct FutureIncompatibleInfo {
pub id: LintId,
/// e.g., a URL for an issue/PR/RFC or error code
pub reference: &'static str,
- /// If this is an epoch fixing lint, the epoch in which
+ /// If this is an edition fixing lint, the edition in which
/// this lint becomes obsolete
- pub epoch: Option<epoch::Epoch>,
+ pub edition: Option<edition::Edition>,
}
/// The target of the `by_name` map, which accounts for renaming/deprecation.
@@ -201,11 +201,11 @@ impl LintStore {
sess: Option<&Session>,
lints: Vec<FutureIncompatibleInfo>) {
- for epoch in epoch::ALL_EPOCHS {
- let lints = lints.iter().filter(|f| f.epoch == Some(*epoch)).map(|f| f.id)
+ for edition in edition::ALL_EDITIONS {
+ let lints = lints.iter().filter(|f| f.edition == Some(*edition)).map(|f| f.id)
.collect::<Vec<_>>();
if !lints.is_empty() {
- self.register_group(sess, false, epoch.lint_name(), lints)
+ self.register_group(sess, false, edition.lint_name(), lints)
}
}
diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index 7c103dc272109..cd038d067a1fd 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -42,7 +42,7 @@ use session::{Session, DiagnosticMessageId};
use std::hash;
use syntax::ast;
use syntax::codemap::MultiSpan;
-use syntax::epoch::Epoch;
+use syntax::edition::Edition;
use syntax::symbol::Symbol;
use syntax::visit as ast_visit;
use syntax_pos::Span;
@@ -77,8 +77,8 @@ pub struct Lint {
/// e.g. "imports that are never used"
pub desc: &'static str,
- /// Deny lint after this epoch
- pub epoch_deny: Option<Epoch>,
+ /// Deny lint after this edition
+ pub edition_deny: Option<Edition>,
}
impl Lint {
@@ -88,8 +88,8 @@ impl Lint {
}
pub fn default_level(&self, session: &Session) -> Level {
- if let Some(epoch_deny) = self.epoch_deny {
- if session.epoch() >= epoch_deny {
+ if let Some(edition_deny) = self.edition_deny {
+ if session.edition() >= edition_deny {
return Level::Deny
}
}
@@ -100,12 +100,12 @@ impl Lint {
/// Declare a static item of type `&'static Lint`.
#[macro_export]
macro_rules! declare_lint {
- ($vis: vis $NAME: ident, $Level: ident, $desc: expr, $epoch: expr) => (
+ ($vis: vis $NAME: ident, $Level: ident, $desc: expr, $edition: expr) => (
$vis static $NAME: &$crate::lint::Lint = &$crate::lint::Lint {
name: stringify!($NAME),
default_level: $crate::lint::$Level,
desc: $desc,
- epoch_deny: Some($epoch)
+ edition_deny: Some($edition)
};
);
($vis: vis $NAME: ident, $Level: ident, $desc: expr) => (
@@ -113,7 +113,7 @@ macro_rules! declare_lint {
name: stringify!($NAME),
default_level: $crate::lint::$Level,
desc: $desc,
- epoch_deny: None,
+ edition_deny: None,
};
);
}
@@ -499,8 +499,8 @@ pub fn struct_lint_level<'a>(sess: &'a Session,
// Check for future incompatibility lints and issue a stronger warning.
let lints = sess.lint_store.borrow();
if let Some(future_incompatible) = lints.future_incompatible(LintId::of(lint)) {
- let future = if let Some(epoch) = future_incompatible.epoch {
- format!("the {} epoch", epoch)
+ let future = if let Some(edition) = future_incompatible.edition {
+ format!("the {} edition", edition)
} else {
"a future release".to_owned()
};
diff --git a/src/librustc/middle/const_val.rs b/src/librustc/middle/const_val.rs
index 8c3dfd0bce752..19a7576b7ceac 100644
--- a/src/librustc/middle/const_val.rs
+++ b/src/librustc/middle/const_val.rs
@@ -19,7 +19,7 @@ use graphviz::IntoCow;
use syntax_pos::Span;
use std::borrow::Cow;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
pub type EvalResult<'tcx> = Result<&'tcx ty::Const<'tcx>, ConstEvalErr<'tcx>>;
@@ -52,7 +52,7 @@ impl<'tcx> ConstVal<'tcx> {
#[derive(Clone, Debug)]
pub struct ConstEvalErr<'tcx> {
pub span: Span,
- pub kind: Rc<ErrKind<'tcx>>,
+ pub kind: Lrc<ErrKind<'tcx>>,
}
#[derive(Clone, Debug)]
diff --git a/src/librustc/middle/cstore.rs b/src/librustc/middle/cstore.rs
index 3c451d7ae46a1..add9b621596b6 100644
--- a/src/librustc/middle/cstore.rs
+++ b/src/librustc/middle/cstore.rs
@@ -132,7 +132,13 @@ pub struct NativeLibrary {
pub kind: NativeLibraryKind,
pub name: Symbol,
pub cfg: Option<ast::MetaItem>,
+ pub foreign_module: Option<DefId>,
+}
+
+#[derive(Clone, Hash, RustcEncodable, RustcDecodable)]
+pub struct ForeignModule {
pub foreign_items: Vec<DefId>,
+ pub def_id: DefId,
}
pub enum LoadedMacro {
diff --git a/src/librustc/middle/dead.rs b/src/librustc/middle/dead.rs
index 1ff9c7a86291e..abd52624c30d4 100644
--- a/src/librustc/middle/dead.rs
+++ b/src/librustc/middle/dead.rs
@@ -318,6 +318,11 @@ fn has_allow_dead_code_or_lang_attr(tcx: TyCtxt,
return true;
}
+ // These constants are special for wasm
+ if attr::contains_name(attrs, "wasm_custom_section") {
+ return true;
+ }
+
tcx.lint_level_at_node(lint::builtin::DEAD_CODE, id).0 == lint::Allow
}
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 0d91074e946bd..4ba634f8b25cd 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -28,7 +28,7 @@ use middle::cstore;
use syntax::ast::{self, IntTy, UintTy};
use syntax::codemap::{FileName, FilePathMapping};
-use syntax::epoch::Epoch;
+use syntax::edition::Edition;
use syntax::parse::token;
use syntax::parse;
use syntax::symbol::Symbol;
@@ -771,7 +771,7 @@ macro_rules! options {
Some("`string` or `string=string`");
pub const parse_lto: Option<&'static str> =
Some("one of `thin`, `fat`, or omitted");
- pub const parse_epoch: Option<&'static str> =
+ pub const parse_edition: Option<&'static str> =
Some("one of: `2015`, `2018`");
}
@@ -780,7 +780,7 @@ macro_rules! options {
use super::{$struct_name, Passes, SomePasses, AllPasses, Sanitizer, Lto};
use rustc_back::{LinkerFlavor, PanicStrategy, RelroLevel};
use std::path::PathBuf;
- use syntax::epoch::Epoch;
+ use syntax::edition::Edition;
$(
pub fn $opt(cg: &mut $struct_name, v: Option<&str>) -> bool {
@@ -983,11 +983,11 @@ macro_rules! options {
true
}
- fn parse_epoch(slot: &mut Epoch, v: Option<&str>) -> bool {
+ fn parse_edition(slot: &mut Edition, v: Option<&str>) -> bool {
match v {
Some(s) => {
- let epoch = s.parse();
- if let Ok(parsed) = epoch {
+ let edition = s.parse();
+ if let Ok(parsed) = edition {
*slot = parsed;
true
} else {
@@ -1280,10 +1280,10 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
`everybody_loops` (all function bodies replaced with `loop {}`),
`hir` (the HIR), `hir,identified`, or
`hir,typed` (HIR with types for each node)."),
- epoch: Epoch = (Epoch::Epoch2015, parse_epoch, [TRACKED],
- "The epoch to build Rust with. Newer epochs may include features
- that require breaking changes. The default epoch is 2015 (the first
- epoch). Crates compiled with different epochs can be linked together."),
+ edition: Edition = (Edition::Edition2015, parse_edition, [TRACKED],
+ "The edition to build Rust with. Newer editions may include features
+ that require breaking changes. The default edition is 2015 (the first
+ edition). Crates compiled with different editions can be linked together."),
run_dsymutil: Option<bool> = (None, parse_opt_bool, [TRACKED],
"run `dsymutil` and delete intermediate object files"),
ui_testing: bool = (false, parse_bool, [UNTRACKED],
@@ -2258,7 +2258,7 @@ mod dep_tracking {
use std::hash::Hash;
use std::path::PathBuf;
use std::collections::hash_map::DefaultHasher;
- use super::{CrateType, DebugInfoLevel, Epoch, ErrorOutputType, Lto, OptLevel, OutputTypes,
+ use super::{CrateType, DebugInfoLevel, Edition, ErrorOutputType, Lto, OptLevel, OutputTypes,
Passes, Sanitizer};
use syntax::feature_gate::UnstableFeatures;
use rustc_back::{PanicStrategy, RelroLevel};
@@ -2320,7 +2320,7 @@ mod dep_tracking {
impl_dep_tracking_hash_via_hash!(cstore::NativeLibraryKind);
impl_dep_tracking_hash_via_hash!(Sanitizer);
impl_dep_tracking_hash_via_hash!(Option<Sanitizer>);
- impl_dep_tracking_hash_via_hash!(Epoch);
+ impl_dep_tracking_hash_via_hash!(Edition);
impl_dep_tracking_hash_for_sortable_vec_of!(String);
impl_dep_tracking_hash_for_sortable_vec_of!(PathBuf);
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 3f52ecfc0999b..556255e06ed00 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -31,7 +31,7 @@ use rustc_data_structures::sync::{Lrc, Lock};
use syntax::ast::NodeId;
use errors::{self, DiagnosticBuilder, DiagnosticId};
use errors::emitter::{Emitter, EmitterWriter};
-use syntax::epoch::Epoch;
+use syntax::edition::Edition;
use syntax::json::JsonEmitter;
use syntax::feature_gate;
use syntax::symbol::Symbol;
@@ -976,13 +976,13 @@ impl Session {
self.opts.debugging_opts.teach && !self.parse_sess.span_diagnostic.code_emitted(code)
}
- /// Are we allowed to use features from the Rust 2018 epoch?
+ /// Are we allowed to use features from the Rust 2018 edition?
pub fn rust_2018(&self) -> bool {
- self.opts.debugging_opts.epoch >= Epoch::Epoch2018
+ self.opts.debugging_opts.edition >= Edition::Edition2018
}
- pub fn epoch(&self) -> Epoch {
- self.opts.debugging_opts.epoch
+ pub fn edition(&self) -> Edition {
+ self.opts.debugging_opts.edition
}
}
diff --git a/src/librustc/traits/error_reporting.rs b/src/librustc/traits/error_reporting.rs
index ab3c619dcdcd0..79d5cf7935941 100644
--- a/src/librustc/traits/error_reporting.rs
+++ b/src/librustc/traits/error_reporting.rs
@@ -443,10 +443,20 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
} else {
4
};
+
+ let normalize = |candidate| self.tcx.global_tcx().infer_ctxt().enter(|ref infcx| {
+ let normalized = infcx
+ .at(&ObligationCause::dummy(), ty::ParamEnv::empty())
+ .normalize(candidate)
+ .ok();
+ match normalized {
+ Some(normalized) => format!("\n {:?}", normalized.value),
+ None => format!("\n {:?}", candidate),
+ }
+ });
+
err.help(&format!("the following implementations were found:{}{}",
- &impl_candidates[0..end].iter().map(|candidate| {
- format!("\n {:?}", candidate)
- }).collect::<String>(),
+ &impl_candidates[0..end].iter().map(normalize).collect::<String>(),
if impl_candidates.len() > 5 {
format!("\nand {} others", impl_candidates.len() - 4)
} else {
diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs
index 017c4f5262e25..af1d2c77c28a8 100644
--- a/src/librustc/traits/query/dropck_outlives.rs
+++ b/src/librustc/traits/query/dropck_outlives.rs
@@ -15,7 +15,7 @@ use std::iter::FromIterator;
use traits::query::CanonicalTyGoal;
use ty::{self, Ty, TyCtxt};
use ty::subst::Kind;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
impl<'cx, 'gcx, 'tcx> At<'cx, 'gcx, 'tcx> {
/// Given a type `ty` of some value being dropped, computes a set
@@ -183,13 +183,13 @@ impl_stable_hash_for!(struct DropckOutlivesResult<'tcx> {
impl<'gcx: 'tcx, 'tcx> Canonicalize<'gcx, 'tcx> for QueryResult<'tcx, DropckOutlivesResult<'tcx>> {
// we ought to intern this, but I'm too lazy just now
- type Canonicalized = Rc<Canonical<'gcx, QueryResult<'gcx, DropckOutlivesResult<'gcx>>>>;
+ type Canonicalized = Lrc<Canonical<'gcx, QueryResult<'gcx, DropckOutlivesResult<'gcx>>>>;
fn intern(
_gcx: TyCtxt<'_, 'gcx, 'gcx>,
value: Canonical<'gcx, Self::Lifted>,
) -> Self::Canonicalized {
- Rc::new(value)
+ Lrc::new(value)
}
}
diff --git a/src/librustc/traits/query/normalize.rs b/src/librustc/traits/query/normalize.rs
index 70c5cf5f39029..63f50cff4c2ad 100644
--- a/src/librustc/traits/query/normalize.rs
+++ b/src/librustc/traits/query/normalize.rs
@@ -17,7 +17,7 @@ use infer::at::At;
use infer::canonical::{Canonical, Canonicalize, QueryResult};
use middle::const_val::ConstVal;
use mir::interpret::GlobalId;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
use traits::{Obligation, ObligationCause, PredicateObligation, Reveal};
use traits::query::CanonicalProjectionGoal;
use traits::project::Normalized;
@@ -259,13 +259,13 @@ impl<'gcx: 'tcx, 'tcx> Canonicalize<'gcx, 'tcx> for ty::ParamEnvAnd<'tcx, ty::Pr
impl<'gcx: 'tcx, 'tcx> Canonicalize<'gcx, 'tcx> for QueryResult<'tcx, NormalizationResult<'tcx>> {
// we ought to intern this, but I'm too lazy just now
- type Canonicalized = Rc<Canonical<'gcx, QueryResult<'gcx, NormalizationResult<'gcx>>>>;
+ type Canonicalized = Lrc<Canonical<'gcx, QueryResult<'gcx, NormalizationResult<'gcx>>>>;
fn intern(
_gcx: TyCtxt<'_, 'gcx, 'gcx>,
value: Canonical<'gcx, Self::Lifted>,
) -> Self::Canonicalized {
- Rc::new(value)
+ Lrc::new(value)
}
}
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index fd3465f59ebf2..966c96e594fc4 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -161,12 +161,12 @@ impl<'gcx: 'tcx, 'tcx> CtxtInterners<'tcx> {
-> Ty<'tcx> {
let ty = {
let mut interner = self.type_.borrow_mut();
- let global_interner = global_interners.map(|interners| {
- interners.type_.borrow_mut()
- });
if let Some(&Interned(ty)) = interner.get(&st) {
return ty;
}
+ let global_interner = global_interners.map(|interners| {
+ interners.type_.borrow_mut()
+ });
if let Some(ref interner) = global_interner {
if let Some(&Interned(ty)) = interner.get(&st) {
return ty;
@@ -1010,17 +1010,16 @@ impl<'tcx> InterpretInterner<'tcx> {
}
}
-impl<'tcx> GlobalCtxt<'tcx> {
+impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
/// Get the global TyCtxt.
- pub fn global_tcx<'a>(&'a self) -> TyCtxt<'a, 'tcx, 'tcx> {
+ #[inline]
+ pub fn global_tcx(self) -> TyCtxt<'a, 'gcx, 'gcx> {
TyCtxt {
- gcx: self,
- interners: &self.global_interners
+ gcx: self.gcx,
+ interners: &self.gcx.global_interners,
}
}
-}
-impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
pub fn alloc_generics(self, generics: ty::Generics) -> &'gcx ty::Generics {
self.global_arenas.generics.alloc(generics)
}
@@ -1081,12 +1080,13 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
self,
alloc: interpret::Allocation,
) -> &'gcx interpret::Allocation {
- if let Some(alloc) = self.interpret_interner.inner.borrow().allocs.get(&alloc) {
+ let allocs = &mut self.interpret_interner.inner.borrow_mut().allocs;
+ if let Some(alloc) = allocs.get(&alloc) {
return alloc;
}
let interned = self.global_arenas.const_allocs.alloc(alloc);
- if let Some(prev) = self.interpret_interner.inner.borrow_mut().allocs.replace(interned) {
+ if let Some(prev) = allocs.replace(interned) {
bug!("Tried to overwrite interned Allocation: {:#?}", prev)
}
interned
@@ -1113,24 +1113,26 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
}
pub fn intern_stability(self, stab: attr::Stability) -> &'gcx attr::Stability {
- if let Some(st) = self.stability_interner.borrow().get(&stab) {
+ let mut stability_interner = self.stability_interner.borrow_mut();
+ if let Some(st) = stability_interner.get(&stab) {
return st;
}
let interned = self.global_interners.arena.alloc(stab);
- if let Some(prev) = self.stability_interner.borrow_mut().replace(interned) {
+ if let Some(prev) = stability_interner.replace(interned) {
bug!("Tried to overwrite interned Stability: {:?}", prev)
}
interned
}
pub fn intern_layout(self, layout: LayoutDetails) -> &'gcx LayoutDetails {
- if let Some(layout) = self.layout_interner.borrow().get(&layout) {
+ let mut layout_interner = self.layout_interner.borrow_mut();
+ if let Some(layout) = layout_interner.get(&layout) {
return layout;
}
let interned = self.global_arenas.layout.alloc(layout);
- if let Some(prev) = self.layout_interner.borrow_mut().replace(interned) {
+ if let Some(prev) = layout_interner.replace(interned) {
bug!("Tried to overwrite interned Layout: {:?}", prev)
}
interned
diff --git a/src/librustc/ty/maps/config.rs b/src/librustc/ty/maps/config.rs
index 117d921931235..7565e90df986f 100644
--- a/src/librustc/ty/maps/config.rs
+++ b/src/librustc/ty/maps/config.rs
@@ -430,6 +430,12 @@ impl<'tcx> QueryDescription<'tcx> for queries::native_libraries<'tcx> {
}
}
+impl<'tcx> QueryDescription<'tcx> for queries::foreign_modules<'tcx> {
+ fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
+ format!("looking up the foreign modules of a linked crate")
+ }
+}
+
impl<'tcx> QueryDescription<'tcx> for queries::plugin_registrar_fn<'tcx> {
fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
format!("looking up the plugin registrar for a crate")
@@ -678,6 +684,12 @@ impl<'tcx> QueryDescription<'tcx> for queries::instance_def_size_estimate<'tcx>
}
}
+impl<'tcx> QueryDescription<'tcx> for queries::wasm_custom_sections<'tcx> {
+ fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
+ format!("custom wasm sections for a crate")
+ }
+}
+
impl<'tcx> QueryDescription<'tcx> for queries::generics_of<'tcx> {
#[inline]
fn cache_on_disk(def_id: Self::Key) -> bool {
@@ -699,6 +711,18 @@ impl<'tcx> QueryDescription<'tcx> for queries::program_clauses_for<'tcx> {
}
}
+impl<'tcx> QueryDescription<'tcx> for queries::wasm_import_module_map<'tcx> {
+ fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
+ format!("wasm import module map")
+ }
+}
+
+impl<'tcx> QueryDescription<'tcx> for queries::dllimport_foreign_items<'tcx> {
+ fn describe(_tcx: TyCtxt, _: CrateNum) -> String {
+ format!("wasm import module map")
+ }
+}
+
macro_rules! impl_disk_cacheable_query(
($query_name:ident, |$key:tt| $cond:expr) => {
impl<'tcx> QueryDescription<'tcx> for queries::$query_name<'tcx> {
diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs
index 6c3b4efb932ad..c16ad0d8ca140 100644
--- a/src/librustc/ty/maps/mod.rs
+++ b/src/librustc/ty/maps/mod.rs
@@ -18,7 +18,7 @@ use infer::canonical::{Canonical, QueryResult};
use lint;
use middle::borrowck::BorrowCheckResult;
use middle::cstore::{ExternCrate, LinkagePreference, NativeLibrary,
- ExternBodyNestedBodies};
+ ExternBodyNestedBodies, ForeignModule};
use middle::cstore::{NativeLibraryKind, DepKind, CrateSource, ExternConstBody};
use middle::privacy::AccessLevels;
use middle::reachable::ReachableSet;
@@ -320,6 +320,9 @@ define_maps! { <'tcx>
[] fn native_libraries: NativeLibraries(CrateNum) -> Lrc<Vec<NativeLibrary>>,
+
+ [] fn foreign_modules: ForeignModules(CrateNum) -> Lrc<Vec<ForeignModule>>,
+
[] fn plugin_registrar_fn: PluginRegistrarFn(CrateNum) -> Option<DefId>,
[] fn derive_registrar_fn: DeriveRegistrarFn(CrateNum) -> Option<DefId>,
[] fn crate_disambiguator: CrateDisambiguator(CrateNum) -> CrateDisambiguator,
@@ -331,6 +334,8 @@ define_maps! { <'tcx>
[] fn all_trait_implementations: AllTraitImplementations(CrateNum)
-> Lrc<Vec<DefId>>,
+ [] fn dllimport_foreign_items: DllimportForeignItems(CrateNum)
+ -> Lrc<FxHashSet<DefId>>,
[] fn is_dllimport_foreign_item: IsDllimportForeignItem(DefId) -> bool,
[] fn is_statically_included_foreign_item: IsStaticallyIncludedForeignItem(DefId) -> bool,
[] fn native_library_kind: NativeLibraryKind(DefId)
@@ -424,6 +429,10 @@ define_maps! { <'tcx>
[] fn features_query: features_node(CrateNum) -> Lrc<feature_gate::Features>,
[] fn program_clauses_for: ProgramClausesFor(DefId) -> Lrc<Vec<Clause<'tcx>>>,
+
+ [] fn wasm_custom_sections: WasmCustomSections(CrateNum) -> Lrc<Vec<DefId>>,
+ [] fn wasm_import_module_map: WasmImportModuleMap(CrateNum)
+ -> Lrc<FxHashMap<DefId, String>>,
}
//////////////////////////////////////////////////////////////////////
diff --git a/src/librustc/ty/maps/plumbing.rs b/src/librustc/ty/maps/plumbing.rs
index 4170fa7679716..46106d8ec0e91 100644
--- a/src/librustc/ty/maps/plumbing.rs
+++ b/src/librustc/ty/maps/plumbing.rs
@@ -886,6 +886,9 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
force!(all_trait_implementations, krate!());
}
+ DepKind::DllimportForeignItems => {
+ force!(dllimport_foreign_items, krate!());
+ }
DepKind::IsDllimportForeignItem => {
force!(is_dllimport_foreign_item, def_id!());
}
@@ -940,6 +943,9 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
DepKind::Features => { force!(features_query, LOCAL_CRATE); }
DepKind::ProgramClausesFor => { force!(program_clauses_for, def_id!()); }
+ DepKind::WasmCustomSections => { force!(wasm_custom_sections, krate!()); }
+ DepKind::WasmImportModuleMap => { force!(wasm_import_module_map, krate!()); }
+ DepKind::ForeignModules => { force!(foreign_modules, krate!()); }
}
true
diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
index c9a69d5405c9a..3fc20508ad7ee 100644
--- a/src/librustc/ty/structural_impls.rs
+++ b/src/librustc/ty/structural_impls.rs
@@ -18,6 +18,7 @@ use ty::{self, Lift, Ty, TyCtxt};
use ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
use rustc_data_structures::accumulate_vec::AccumulateVec;
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
+use rustc_data_structures::sync::Lrc;
use mir::interpret;
use std::rc::Rc;
@@ -465,7 +466,7 @@ impl<'a, 'tcx> Lift<'tcx> for ConstEvalErr<'a> {
tcx.lift(&*self.kind).map(|kind| {
ConstEvalErr {
span: self.span,
- kind: Rc::new(kind),
+ kind: Lrc::new(kind),
}
})
}
diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs
index d7ab6e39ac5f0..2b88db503030d 100644
--- a/src/librustc/ty/sty.rs
+++ b/src/librustc/ty/sty.rs
@@ -1670,7 +1670,6 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
pub struct Const<'tcx> {
pub ty: Ty<'tcx>,
- // FIXME(eddyb) Replace this with a miri value.
pub val: ConstVal<'tcx>,
}
diff --git a/src/librustc/ty/subst.rs b/src/librustc/ty/subst.rs
index a301049fe1c40..e7b58ae1564aa 100644
--- a/src/librustc/ty/subst.rs
+++ b/src/librustc/ty/subst.rs
@@ -19,11 +19,11 @@ use syntax_pos::{Span, DUMMY_SP};
use rustc_data_structures::accumulate_vec::AccumulateVec;
use core::intrinsics;
-use core::nonzero::NonZero;
use std::fmt;
use std::iter;
use std::marker::PhantomData;
use std::mem;
+use std::num::NonZeroUsize;
/// An entity in the Rust typesystem, which can be one of
/// several kinds (only types and lifetimes for now).
@@ -32,7 +32,7 @@ use std::mem;
/// indicate the type (`Ty` or `Region`) it points to.
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
pub struct Kind<'tcx> {
- ptr: NonZero<usize>,
+ ptr: NonZeroUsize,
marker: PhantomData<(Ty<'tcx>, ty::Region<'tcx>)>
}
@@ -63,7 +63,7 @@ impl<'tcx> UnpackedKind<'tcx> {
Kind {
ptr: unsafe {
- NonZero::new_unchecked(ptr | tag)
+ NonZeroUsize::new_unchecked(ptr | tag)
},
marker: PhantomData
}
diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs
index 2c3ee1ec285a9..056f1278c47c7 100644
--- a/src/librustc/util/ppaux.rs
+++ b/src/librustc/util/ppaux.rs
@@ -1177,8 +1177,8 @@ define_print! {
ConstVal::Value(Value::ByVal(PrimVal::Bytes(sz))) => {
write!(f, "{}", sz)?;
}
- ConstVal::Unevaluated(_def_id, substs) => {
- write!(f, "<unevaluated{:?}>", &substs[..])?;
+ ConstVal::Unevaluated(_def_id, _substs) => {
+ write!(f, "_")?;
}
_ => {
write!(f, "{:?}", sz)?;
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index 81246aea1b56e..bf0b3726bb301 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -76,6 +76,14 @@ pub mod flock;
pub mod sync;
pub mod owning_ref;
+pub struct OnDrop<F: Fn()>(pub F);
+
+impl<F: Fn()> Drop for OnDrop<F> {
+ fn drop(&mut self) {
+ (self.0)();
+ }
+}
+
// See comments in src/librustc/lib.rs
#[doc(hidden)]
pub fn __noop_fix_for_27438() {}
diff --git a/src/librustc_data_structures/obligation_forest/node_index.rs b/src/librustc_data_structures/obligation_forest/node_index.rs
index a72cc6b57eade..37512e4bcd57f 100644
--- a/src/librustc_data_structures/obligation_forest/node_index.rs
+++ b/src/librustc_data_structures/obligation_forest/node_index.rs
@@ -8,18 +8,18 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use core::nonzero::NonZero;
+use std::num::NonZeroU32;
use std::u32;
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub struct NodeIndex {
- index: NonZero<u32>,
+ index: NonZeroU32,
}
impl NodeIndex {
pub fn new(value: usize) -> NodeIndex {
assert!(value < (u32::MAX as usize));
- NodeIndex { index: NonZero::new((value as u32) + 1).unwrap() }
+ NodeIndex { index: NonZeroU32::new((value as u32) + 1).unwrap() }
}
pub fn get(self) -> usize {
diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs
index d7cd459e5771c..184ef1369761c 100644
--- a/src/librustc_data_structures/sync.rs
+++ b/src/librustc_data_structures/sync.rs
@@ -26,11 +26,6 @@
//!
//! `MTLock` is a mutex which disappears if cfg!(parallel_queries) is false.
//!
-//! `rustc_global!` gives us a way to declare variables which are intended to be
-//! global for the current rustc session. This currently maps to thread-locals,
-//! since rustdoc uses the rustc libraries in multiple threads.
-//! These globals should eventually be moved into the `Session` structure.
-//!
//! `rustc_erase_owner!` erases a OwningRef owner into Erased or Erased + Send + Sync
//! depending on the value of cfg!(parallel_queries).
@@ -228,31 +223,6 @@ pub fn assert_sync<T: ?Sized + Sync>() {}
pub fn assert_send_val<T: ?Sized + Send>(_t: &T) {}
pub fn assert_send_sync_val<T: ?Sized + Sync + Send>(_t: &T) {}
-#[macro_export]
-#[allow_internal_unstable]
-macro_rules! rustc_global {
- // empty (base case for the recursion)
- () => {};
-
- // process multiple declarations
- ($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
- thread_local!($(#[$attr])* $vis static $name: $t = $init);
- rustc_global!($($rest)*);
- );
-
- // handle a single declaration
- ($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr) => (
- thread_local!($(#[$attr])* $vis static $name: $t = $init);
- );
-}
-
-#[macro_export]
-macro_rules! rustc_access_global {
- ($name:path, $callback:expr) => {
- $name.with($callback)
- }
-}
-
impl<T: Copy + Debug> Debug for LockCell<T> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
f.debug_struct("LockCell")
@@ -363,6 +333,13 @@ impl<T> Lock<T> {
}
}
+impl<T: Default> Default for Lock<T> {
+ #[inline]
+ fn default() -> Self {
+ Lock::new(T::default())
+ }
+}
+
// FIXME: Probably a bad idea
impl<T: Clone> Clone for Lock<T> {
#[inline]
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs
index f2fe6542db171..a3115544f30b9 100644
--- a/src/librustc_driver/driver.rs
+++ b/src/librustc_driver/driver.rs
@@ -648,7 +648,7 @@ pub fn phase_2_configure_and_expand_inner<'a, F>(sess: &'a Session,
{
let (mut krate, features) = syntax::config::features(krate, &sess.parse_sess,
sess.opts.test,
- sess.opts.debugging_opts.epoch);
+ sess.opts.debugging_opts.edition);
// these need to be set "early" so that expansion sees `quote` if enabled.
sess.init_features(features);
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index bffa8628ff353..c0728cb2b6669 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -46,6 +46,7 @@ use syntax::attr;
use syntax::feature_gate::{AttributeGate, AttributeType, Stability, deprecated_attributes};
use syntax_pos::{BytePos, Span, SyntaxContext};
use syntax::symbol::keywords;
+use syntax::errors::DiagnosticBuilder;
use rustc::hir::{self, PatKind};
use rustc::hir::intravisit::FnKind;
@@ -1316,48 +1317,115 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnreachablePub {
}
}
-/// Lint for trait and lifetime bounds that are (accidentally) accepted by the parser, but
-/// ignored later.
+/// Lint for trait and lifetime bounds in type aliases being mostly ignored:
+/// They are relevant when using associated types, but otherwise neither checked
+/// at definition site nor enforced at use site.
-pub struct IgnoredGenericBounds;
+pub struct TypeAliasBounds;
declare_lint! {
- IGNORED_GENERIC_BOUNDS,
+ TYPE_ALIAS_BOUNDS,
Warn,
- "these generic bounds are ignored"
+ "bounds in type aliases are not enforced"
}
-impl LintPass for IgnoredGenericBounds {
+impl LintPass for TypeAliasBounds {
fn get_lints(&self) -> LintArray {
- lint_array!(IGNORED_GENERIC_BOUNDS)
+ lint_array!(TYPE_ALIAS_BOUNDS)
}
}
-impl EarlyLintPass for IgnoredGenericBounds {
- fn check_item(&mut self, cx: &EarlyContext, item: &ast::Item) {
- let type_alias_generics = match item.node {
- ast::ItemKind::Ty(_, ref generics) => generics,
+impl TypeAliasBounds {
+ fn is_type_variable_assoc(qpath: &hir::QPath) -> bool {
+ match *qpath {
+ hir::QPath::TypeRelative(ref ty, _) => {
+ // If this is a type variable, we found a `T::Assoc`.
+ match ty.node {
+ hir::TyPath(hir::QPath::Resolved(None, ref path)) => {
+ match path.def {
+ Def::TyParam(_) => true,
+ _ => false
+ }
+ }
+ _ => false
+ }
+ }
+ hir::QPath::Resolved(..) => false,
+ }
+ }
+
+ fn suggest_changing_assoc_types(ty: &hir::Ty, err: &mut DiagnosticBuilder) {
+ // Access to associates types should use `<T as Bound>::Assoc`, which does not need a
+ // bound. Let's see if this type does that.
+
+ // We use a HIR visitor to walk the type.
+ use rustc::hir::intravisit::{self, Visitor};
+ use syntax::ast::NodeId;
+ struct WalkAssocTypes<'a, 'db> where 'db: 'a {
+ err: &'a mut DiagnosticBuilder<'db>
+ }
+ impl<'a, 'db, 'v> Visitor<'v> for WalkAssocTypes<'a, 'db> {
+ fn nested_visit_map<'this>(&'this mut self) -> intravisit::NestedVisitorMap<'this, 'v>
+ {
+ intravisit::NestedVisitorMap::None
+ }
+
+ fn visit_qpath(&mut self, qpath: &'v hir::QPath, id: NodeId, span: Span) {
+ if TypeAliasBounds::is_type_variable_assoc(qpath) {
+ self.err.span_help(span,
+ "use fully disambiguated paths (i.e., `<T as Trait>::Assoc`) to refer to \
+ associated types in type aliases");
+ }
+ intravisit::walk_qpath(self, qpath, id, span)
+ }
+ }
+
+ // Let's go for a walk!
+ let mut visitor = WalkAssocTypes { err };
+ visitor.visit_ty(ty);
+ }
+}
+
+impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeAliasBounds {
+ fn check_item(&mut self, cx: &LateContext, item: &hir::Item) {
+ let (ty, type_alias_generics) = match item.node {
+ hir::ItemTy(ref ty, ref generics) => (&*ty, generics),
_ => return,
};
+ let mut suggested_changing_assoc_types = false;
// There must not be a where clause
if !type_alias_generics.where_clause.predicates.is_empty() {
let spans : Vec<_> = type_alias_generics.where_clause.predicates.iter()
.map(|pred| pred.span()).collect();
- cx.span_lint(IGNORED_GENERIC_BOUNDS, spans,
- "where clauses are ignored in type aliases");
+ let mut err = cx.struct_span_lint(TYPE_ALIAS_BOUNDS, spans,
+ "where clauses are not enforced in type aliases");
+ err.help("the clause will not be checked when the type alias is used, \
+ and should be removed");
+ if !suggested_changing_assoc_types {
+ TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
+ suggested_changing_assoc_types = true;
+ }
+ err.emit();
}
// The parameters must not have bounds
for param in type_alias_generics.params.iter() {
let spans : Vec<_> = match param {
- &ast::GenericParam::Lifetime(ref l) => l.bounds.iter().map(|b| b.span).collect(),
- &ast::GenericParam::Type(ref ty) => ty.bounds.iter().map(|b| b.span()).collect(),
+ &hir::GenericParam::Lifetime(ref l) => l.bounds.iter().map(|b| b.span).collect(),
+ &hir::GenericParam::Type(ref ty) => ty.bounds.iter().map(|b| b.span()).collect(),
};
if !spans.is_empty() {
- cx.span_lint(
- IGNORED_GENERIC_BOUNDS,
+ let mut err = cx.struct_span_lint(
+ TYPE_ALIAS_BOUNDS,
spans,
- "bounds on generic parameters are ignored in type aliases",
+ "bounds on generic parameters are not enforced in type aliases",
);
+ err.help("the bound will not be checked when the type alias is used, \
+ and should be removed");
+ if !suggested_changing_assoc_types {
+ TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
+ suggested_changing_assoc_types = true;
+ }
+ err.emit();
}
}
}
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index ce896bfb701ba..901d76edc8065 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -48,7 +48,7 @@ use rustc::session;
use rustc::util;
use session::Session;
-use syntax::epoch::Epoch;
+use syntax::edition::Edition;
use lint::LintId;
use lint::FutureIncompatibleInfo;
@@ -109,7 +109,6 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
UnusedImportBraces,
AnonymousParameters,
UnusedDocComment,
- IgnoredGenericBounds,
);
add_early_builtin_with_new!(sess,
@@ -139,6 +138,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
MutableTransmutes,
UnionsWithDropFields,
UnreachablePub,
+ TypeAliasBounds,
);
add_builtin_with_new!(sess,
@@ -197,82 +197,82 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
FutureIncompatibleInfo {
id: LintId::of(PRIVATE_IN_PUBLIC),
reference: "issue #34537 <https://github.com/rust-lang/rust/issues/34537>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(PUB_USE_OF_PRIVATE_EXTERN_CRATE),
reference: "issue #34537 <https://github.com/rust-lang/rust/issues/34537>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(PATTERNS_IN_FNS_WITHOUT_BODY),
reference: "issue #35203 <https://github.com/rust-lang/rust/issues/35203>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(SAFE_EXTERN_STATICS),
reference: "issue #36247 <https://github.com/rust-lang/rust/issues/36247>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(INVALID_TYPE_PARAM_DEFAULT),
reference: "issue #36887 <https://github.com/rust-lang/rust/issues/36887>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(LEGACY_DIRECTORY_OWNERSHIP),
reference: "issue #37872 <https://github.com/rust-lang/rust/issues/37872>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(LEGACY_IMPORTS),
reference: "issue #38260 <https://github.com/rust-lang/rust/issues/38260>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(LEGACY_CONSTRUCTOR_VISIBILITY),
reference: "issue #39207 <https://github.com/rust-lang/rust/issues/39207>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(MISSING_FRAGMENT_SPECIFIER),
reference: "issue #40107 <https://github.com/rust-lang/rust/issues/40107>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(ILLEGAL_FLOATING_POINT_LITERAL_PATTERN),
reference: "issue #41620 <https://github.com/rust-lang/rust/issues/41620>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(ANONYMOUS_PARAMETERS),
reference: "issue #41686 <https://github.com/rust-lang/rust/issues/41686>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES),
reference: "issue #42238 <https://github.com/rust-lang/rust/issues/42238>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(LATE_BOUND_LIFETIME_ARGUMENTS),
reference: "issue #42868 <https://github.com/rust-lang/rust/issues/42868>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(SAFE_PACKED_BORROWS),
reference: "issue #46043 <https://github.com/rust-lang/rust/issues/46043>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(INCOHERENT_FUNDAMENTAL_IMPLS),
reference: "issue #46205 <https://github.com/rust-lang/rust/issues/46205>",
- epoch: None,
+ edition: None,
},
FutureIncompatibleInfo {
id: LintId::of(TYVAR_BEHIND_RAW_POINTER),
reference: "issue #46906 <https://github.com/rust-lang/rust/issues/46906>",
- epoch: Some(Epoch::Epoch2018),
+ edition: Some(Edition::Edition2018),
}
]);
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index a0546b369a8eb..baaf57c890898 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -12,7 +12,6 @@
use cstore::{self, CStore, CrateSource, MetadataBlob};
use locator::{self, CratePaths};
-use native_libs::relevant_lib;
use schema::CrateRoot;
use rustc_data_structures::sync::{Lrc, RwLock, Lock};
@@ -230,7 +229,7 @@ impl<'a> CrateLoader<'a> {
.map(|trait_impls| (trait_impls.trait_id, trait_impls.impls))
.collect();
- let mut cmeta = cstore::CrateMetadata {
+ let cmeta = cstore::CrateMetadata {
name,
extern_crate: Lock::new(None),
def_path_table: Lrc::new(def_path_table),
@@ -250,25 +249,8 @@ impl<'a> CrateLoader<'a> {
rlib,
rmeta,
},
- // Initialize this with an empty set. The field is populated below
- // after we were able to deserialize its contents.
- dllimport_foreign_items: FxHashSet(),
};
- let dllimports: FxHashSet<_> = cmeta
- .root
- .native_libraries
- .decode((&cmeta, self.sess))
- .filter(|lib| relevant_lib(self.sess, lib) &&
- lib.kind == cstore::NativeLibraryKind::NativeUnknown)
- .flat_map(|lib| {
- assert!(lib.foreign_items.iter().all(|def_id| def_id.krate == cnum));
- lib.foreign_items.into_iter().map(|def_id| def_id.index)
- })
- .collect();
-
- cmeta.dllimport_foreign_items = dllimports;
-
let cmeta = Lrc::new(cmeta);
self.cstore.set_crate_data(cnum, cmeta.clone());
(cnum, cmeta)
diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs
index bd5ad93946e3c..53986f0741005 100644
--- a/src/librustc_metadata/cstore.rs
+++ b/src/librustc_metadata/cstore.rs
@@ -20,7 +20,7 @@ use rustc::middle::cstore::{DepKind, ExternCrate, MetadataLoader};
use rustc::session::{Session, CrateDisambiguator};
use rustc_back::PanicStrategy;
use rustc_data_structures::indexed_vec::IndexVec;
-use rustc::util::nodemap::{FxHashMap, FxHashSet, NodeMap};
+use rustc::util::nodemap::{FxHashMap, NodeMap};
use rustc_data_structures::sync::{Lrc, RwLock, Lock};
use syntax::{ast, attr};
@@ -30,7 +30,7 @@ use syntax_pos;
pub use rustc::middle::cstore::{NativeLibrary, NativeLibraryKind, LinkagePreference};
pub use rustc::middle::cstore::NativeLibraryKind::*;
-pub use rustc::middle::cstore::{CrateSource, LibSource};
+pub use rustc::middle::cstore::{CrateSource, LibSource, ForeignModule};
pub use cstore_impl::{provide, provide_extern};
@@ -84,8 +84,6 @@ pub struct CrateMetadata {
pub source: CrateSource,
pub proc_macros: Option<Vec<(ast::Name, Lrc<SyntaxExtension>)>>,
- // Foreign items imported from a dylib (Windows only)
- pub dllimport_foreign_items: FxHashSet<DefIndex>,
}
pub struct CStore {
diff --git a/src/librustc_metadata/cstore_impl.rs b/src/librustc_metadata/cstore_impl.rs
index 2de27f3a1c3ea..e911a03bbe2b5 100644
--- a/src/librustc_metadata/cstore_impl.rs
+++ b/src/librustc_metadata/cstore_impl.rs
@@ -12,6 +12,7 @@ use cstore;
use encoder;
use link_args;
use native_libs;
+use foreign_modules;
use schema;
use rustc::ty::maps::QueryConfig;
@@ -197,6 +198,7 @@ provide! { <'tcx> tcx, def_id, other, cdata,
Lrc::new(reachable_non_generics)
}
native_libraries => { Lrc::new(cdata.get_native_libraries(tcx.sess)) }
+ foreign_modules => { Lrc::new(cdata.get_foreign_modules(tcx.sess)) }
plugin_registrar_fn => {
cdata.root.plugin_registrar_fn.map(|index| {
DefId { krate: def_id.krate, index }
@@ -224,9 +226,6 @@ provide! { <'tcx> tcx, def_id, other, cdata,
Lrc::new(result)
}
- is_dllimport_foreign_item => {
- cdata.is_dllimport_foreign_item(def_id.index)
- }
visibility => { cdata.get_visibility(def_id.index) }
dep_kind => {
let r = *cdata.dep_kind.lock();
@@ -271,6 +270,8 @@ provide! { <'tcx> tcx, def_id, other, cdata,
Arc::new(cdata.exported_symbols())
}
+
+ wasm_custom_sections => { Lrc::new(cdata.wasm_custom_sections()) }
}
pub fn provide<'tcx>(providers: &mut Providers<'tcx>) {
@@ -304,13 +305,28 @@ pub fn provide<'tcx>(providers: &mut Providers<'tcx>) {
tcx.native_libraries(id.krate)
.iter()
.filter(|lib| native_libs::relevant_lib(&tcx.sess, lib))
- .find(|l| l.foreign_items.contains(&id))
+ .find(|lib| {
+ let fm_id = match lib.foreign_module {
+ Some(id) => id,
+ None => return false,
+ };
+ tcx.foreign_modules(id.krate)
+ .iter()
+ .find(|m| m.def_id == fm_id)
+ .expect("failed to find foreign module")
+ .foreign_items
+ .contains(&id)
+ })
.map(|l| l.kind)
},
native_libraries: |tcx, cnum| {
assert_eq!(cnum, LOCAL_CRATE);
Lrc::new(native_libs::collect(tcx))
},
+ foreign_modules: |tcx, cnum| {
+ assert_eq!(cnum, LOCAL_CRATE);
+ Lrc::new(foreign_modules::collect(tcx))
+ },
link_args: |tcx, cnum| {
assert_eq!(cnum, LOCAL_CRATE);
Lrc::new(link_args::collect(tcx))
diff --git a/src/librustc_metadata/decoder.rs b/src/librustc_metadata/decoder.rs
index b0c945fbf2a05..e72f9ddd82abe 100644
--- a/src/librustc_metadata/decoder.rs
+++ b/src/librustc_metadata/decoder.rs
@@ -10,7 +10,7 @@
// Decoding metadata from a single crate's metadata
-use cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary};
+use cstore::{self, CrateMetadata, MetadataBlob, NativeLibrary, ForeignModule};
use schema::*;
use rustc_data_structures::sync::{Lrc, ReadGuard};
@@ -1031,6 +1031,10 @@ impl<'a, 'tcx> CrateMetadata {
self.root.native_libraries.decode((self, sess)).collect()
}
+ pub fn get_foreign_modules(&self, sess: &Session) -> Vec<ForeignModule> {
+ self.root.foreign_modules.decode((self, sess)).collect()
+ }
+
pub fn get_dylib_dependency_formats(&self) -> Vec<(CrateNum, LinkagePreference)> {
self.root
.dylib_dependency_formats
@@ -1067,6 +1071,16 @@ impl<'a, 'tcx> CrateMetadata {
.collect()
}
+ pub fn wasm_custom_sections(&self) -> Vec<DefId> {
+ let sections = self.root
+ .wasm_custom_sections
+ .decode(self)
+ .map(|def_index| self.local_def_id(def_index))
+ .collect::<Vec<_>>();
+ info!("loaded wasm sections {:?}", sections);
+ return sections
+ }
+
pub fn get_macro(&self, id: DefIndex) -> (InternedString, MacroDef) {
let entry = self.entry(id);
match entry.kind {
@@ -1093,10 +1107,6 @@ impl<'a, 'tcx> CrateMetadata {
}
}
- pub fn is_dllimport_foreign_item(&self, id: DefIndex) -> bool {
- self.dllimport_foreign_items.contains(&id)
- }
-
pub fn fn_sig(&self,
id: DefIndex,
tcx: TyCtxt<'a, 'tcx, 'tcx>)
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
index 6b3453f2c99e8..39de1ec852ec4 100644
--- a/src/librustc_metadata/encoder.rs
+++ b/src/librustc_metadata/encoder.rs
@@ -14,7 +14,7 @@ use isolated_encoder::IsolatedEncoder;
use schema::*;
use rustc::middle::cstore::{LinkMeta, LinkagePreference, NativeLibrary,
- EncodedMetadata};
+ EncodedMetadata, ForeignModule};
use rustc::hir::def::CtorKind;
use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefIndex, DefId, LocalDefId, LOCAL_CRATE};
use rustc::hir::map::definitions::DefPathTable;
@@ -412,6 +412,10 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
());
let native_lib_bytes = self.position() - i;
+ let foreign_modules = self.tracked(
+ IsolatedEncoder::encode_foreign_modules,
+ ());
+
// Encode codemap
i = self.position();
let codemap = self.encode_codemap();
@@ -435,6 +439,12 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
&exported_symbols);
let exported_symbols_bytes = self.position() - i;
+ // encode wasm custom sections
+ let wasm_custom_sections = self.tcx.wasm_custom_sections(LOCAL_CRATE);
+ let wasm_custom_sections = self.tracked(
+ IsolatedEncoder::encode_wasm_custom_sections,
+ &wasm_custom_sections);
+
// Encode and index the items.
i = self.position();
let items = self.encode_info_for_items();
@@ -474,10 +484,12 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
lang_items,
lang_items_missing,
native_libraries,
+ foreign_modules,
codemap,
def_path_table,
impls,
exported_symbols,
+ wasm_custom_sections,
index,
});
@@ -1330,6 +1342,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
self.lazy_seq(used_libraries.iter().cloned())
}
+ fn encode_foreign_modules(&mut self, _: ()) -> LazySeq<ForeignModule> {
+ let foreign_modules = self.tcx.foreign_modules(LOCAL_CRATE);
+ self.lazy_seq(foreign_modules.iter().cloned())
+ }
+
fn encode_crate_deps(&mut self, _: ()) -> LazySeq<CrateDep> {
let crates = self.tcx.crates();
@@ -1444,6 +1461,11 @@ impl<'a, 'b: 'a, 'tcx: 'b> IsolatedEncoder<'a, 'b, 'tcx> {
.cloned())
}
+ fn encode_wasm_custom_sections(&mut self, statics: &[DefId]) -> LazySeq<DefIndex> {
+ info!("encoding custom wasm section constants {:?}", statics);
+ self.lazy_seq(statics.iter().map(|id| id.index))
+ }
+
fn encode_dylib_dependency_formats(&mut self, _: ()) -> LazySeq<Option<LinkagePreference>> {
match self.tcx.sess.dependency_formats.borrow().get(&config::CrateTypeDylib) {
Some(arr) => {
diff --git a/src/librustc_metadata/foreign_modules.rs b/src/librustc_metadata/foreign_modules.rs
new file mode 100644
index 0000000000000..c44d891b7f39a
--- /dev/null
+++ b/src/librustc_metadata/foreign_modules.rs
@@ -0,0 +1,48 @@
+// Copyright 2017 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.
+
+use rustc::hir::itemlikevisit::ItemLikeVisitor;
+use rustc::hir;
+use rustc::middle::cstore::ForeignModule;
+use rustc::ty::TyCtxt;
+
+pub fn collect<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) -> Vec<ForeignModule> {
+ let mut collector = Collector {
+ tcx,
+ modules: Vec::new(),
+ };
+ tcx.hir.krate().visit_all_item_likes(&mut collector);
+ return collector.modules
+}
+
+struct Collector<'a, 'tcx: 'a> {
+ tcx: TyCtxt<'a, 'tcx, 'tcx>,
+ modules: Vec<ForeignModule>,
+}
+
+impl<'a, 'tcx> ItemLikeVisitor<'tcx> for Collector<'a, 'tcx> {
+ fn visit_item(&mut self, it: &'tcx hir::Item) {
+ let fm = match it.node {
+ hir::ItemForeignMod(ref fm) => fm,
+ _ => return,
+ };
+
+ let foreign_items = fm.items.iter()
+ .map(|it| self.tcx.hir.local_def_id(it.id))
+ .collect();
+ self.modules.push(ForeignModule {
+ foreign_items,
+ def_id: self.tcx.hir.local_def_id(it.id),
+ });
+ }
+
+ fn visit_trait_item(&mut self, _it: &'tcx hir::TraitItem) {}
+ fn visit_impl_item(&mut self, _it: &'tcx hir::ImplItem) {}
+}
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index f77c22bd89544..8509966744948 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -56,6 +56,7 @@ mod isolated_encoder;
mod schema;
mod native_libs;
mod link_args;
+mod foreign_modules;
pub mod creader;
pub mod cstore;
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs
index 2504f8dc251f9..4bb6d8fb87cf5 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/src/librustc_metadata/native_libs.rs
@@ -105,14 +105,11 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for Collector<'a, 'tcx> {
} else {
None
};
- let foreign_items = fm.items.iter()
- .map(|it| self.tcx.hir.local_def_id(it.id))
- .collect();
let lib = NativeLibrary {
name: n,
kind,
cfg,
- foreign_items,
+ foreign_module: Some(self.tcx.hir.local_def_id(it.id)),
};
self.register_native_lib(Some(m.span), lib);
}
@@ -218,7 +215,7 @@ impl<'a, 'tcx> Collector<'a, 'tcx> {
name: Symbol::intern(new_name.unwrap_or(name)),
kind: if let Some(k) = kind { k } else { cstore::NativeUnknown },
cfg: None,
- foreign_items: Vec::new(),
+ foreign_module: None,
};
self.register_native_lib(None, lib);
}
diff --git a/src/librustc_metadata/schema.rs b/src/librustc_metadata/schema.rs
index 593f08e90bb3b..9832794529701 100644
--- a/src/librustc_metadata/schema.rs
+++ b/src/librustc_metadata/schema.rs
@@ -15,8 +15,8 @@ use rustc::hir;
use rustc::hir::def::{self, CtorKind};
use rustc::hir::def_id::{DefIndex, DefId, CrateNum};
use rustc::ich::StableHashingContext;
-use rustc::middle::cstore::{DepKind, LinkagePreference, NativeLibrary};
use rustc::middle::exported_symbols::{ExportedSymbol, SymbolExportLevel};
+use rustc::middle::cstore::{DepKind, LinkagePreference, NativeLibrary, ForeignModule};
use rustc::middle::lang_items;
use rustc::mir;
use rustc::session::CrateDisambiguator;
@@ -200,10 +200,12 @@ pub struct CrateRoot {
pub lang_items: LazySeq<(DefIndex, usize)>,
pub lang_items_missing: LazySeq<lang_items::LangItem>,
pub native_libraries: LazySeq<NativeLibrary>,
+ pub foreign_modules: LazySeq<ForeignModule>,
pub codemap: LazySeq<syntax_pos::FileMap>,
pub def_path_table: Lazy<hir::map::definitions::DefPathTable>,
pub impls: LazySeq<TraitImpls>,
pub exported_symbols: LazySeq<(ExportedSymbol, SymbolExportLevel)>,
+ pub wasm_custom_sections: LazySeq<DefIndex>,
pub index: LazySeq<index::Index>,
}
diff --git a/src/librustc_mir/dataflow/move_paths/mod.rs b/src/librustc_mir/dataflow/move_paths/mod.rs
index 7b6ebc6fba872..9f6cf8c036e19 100644
--- a/src/librustc_mir/dataflow/move_paths/mod.rs
+++ b/src/librustc_mir/dataflow/move_paths/mod.rs
@@ -29,17 +29,17 @@ mod abs_domain;
// (which is likely to yield a subtle off-by-one error).
pub(crate) mod indexes {
use std::fmt;
- use core::nonzero::NonZero;
+ use std::num::NonZeroUsize;
use rustc_data_structures::indexed_vec::Idx;
macro_rules! new_index {
($Index:ident, $debug_name:expr) => {
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
- pub struct $Index(NonZero<usize>);
+ pub struct $Index(NonZeroUsize);
impl Idx for $Index {
fn new(idx: usize) -> Self {
- $Index(NonZero::new(idx + 1).unwrap())
+ $Index(NonZeroUsize::new(idx + 1).unwrap())
}
fn index(self) -> usize {
self.0.get() - 1
diff --git a/src/librustc_mir/interpret/const_eval.rs b/src/librustc_mir/interpret/const_eval.rs
index 47f6f61072e13..87219511e6ff3 100644
--- a/src/librustc_mir/interpret/const_eval.rs
+++ b/src/librustc_mir/interpret/const_eval.rs
@@ -14,7 +14,7 @@ use super::{Place, EvalContext, StackPopCleanup, ValTy, PlaceExtra, Memory};
use std::fmt;
use std::error::Error;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
pub fn mk_borrowck_eval_cx<'a, 'mir, 'tcx>(
tcx: TyCtxt<'a, 'tcx, 'tcx>,
@@ -485,7 +485,7 @@ pub fn const_eval_provider<'a, 'tcx>(
// Do match-check before building MIR
if tcx.check_match(def_id).is_err() {
return Err(ConstEvalErr {
- kind: Rc::new(CheckMatchError),
+ kind: Lrc::new(CheckMatchError),
span,
});
}
@@ -497,7 +497,7 @@ pub fn const_eval_provider<'a, 'tcx>(
// Do not continue into miri if typeck errors occurred; it will fail horribly
if tables.tainted_by_errors {
return Err(ConstEvalErr {
- kind: Rc::new(TypeckError),
+ kind: Lrc::new(TypeckError),
span,
});
}
diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs
index e5157a071bf0a..37274d1fc4479 100644
--- a/src/librustc_passes/ast_validation.rs
+++ b/src/librustc_passes/ast_validation.rs
@@ -41,13 +41,13 @@ impl<'a> AstValidator<'a> {
keywords::StaticLifetime.name(),
keywords::Invalid.name()];
if !valid_names.contains(&lifetime.ident.name) &&
- token::Ident(lifetime.ident.without_first_quote()).is_reserved_ident() {
+ token::is_reserved_ident(lifetime.ident.without_first_quote()) {
self.err_handler().span_err(lifetime.span, "lifetimes cannot use keyword names");
}
}
fn check_label(&self, label: Ident, span: Span) {
- if token::Ident(label.without_first_quote()).is_reserved_ident() {
+ if token::is_reserved_ident(label.without_first_quote()) {
self.err_handler().span_err(span, &format!("invalid label name `{}`", label.name));
}
}
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index dc22c23271d63..2cb2c76c6320b 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -3206,7 +3206,7 @@ impl<'a> Resolver<'a> {
// `$crate::a::b`
module = Some(self.resolve_crate_root(ident.node.ctxt, true));
continue
- } else if i == 1 && !token::Ident(ident.node).is_path_segment_keyword() {
+ } else if i == 1 && !token::is_path_segment_keyword(ident.node) {
let prev_name = path[0].node.name;
if prev_name == keywords::Extern.name() ||
prev_name == keywords::CrateRoot.name() &&
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 95fa0f3b52fef..0692a1e0d7f8a 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -268,7 +268,7 @@ impl<'a> base::Resolver for Resolver<'a> {
if k > 0 {
tokens.push(TokenTree::Token(path.span, Token::ModSep).into());
}
- let tok = Token::Ident(segment.identifier);
+ let tok = Token::from_ast_ident(segment.identifier);
tokens.push(TokenTree::Token(path.span, tok).into());
}
}
diff --git a/src/librustc_resolve/resolve_imports.rs b/src/librustc_resolve/resolve_imports.rs
index 644a2ffe3c379..7036bdd0e2b07 100644
--- a/src/librustc_resolve/resolve_imports.rs
+++ b/src/librustc_resolve/resolve_imports.rs
@@ -625,7 +625,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
} else {
Some(self.resolve_crate_root(source.ctxt.modern(), false))
}
- } else if is_extern && !token::Ident(source).is_path_segment_keyword() {
+ } else if is_extern && !token::is_path_segment_keyword(source) {
let crate_id =
self.crate_loader.resolve_crate_from_path(source.name, directive.span);
let crate_root =
@@ -667,7 +667,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
}
PathResult::Failed(span, msg, true) => {
let (mut self_path, mut self_result) = (module_path.clone(), None);
- let is_special = |ident| token::Ident(ident).is_path_segment_keyword() &&
+ let is_special = |ident| token::is_path_segment_keyword(ident) &&
ident.name != keywords::CrateRoot.name();
if !self_path.is_empty() && !is_special(self_path[0].node) &&
!(self_path.len() > 1 && is_special(self_path[1].node)) {
diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs
index 2a8cfe5cc06b3..1fe2f87128abd 100644
--- a/src/librustc_traits/dropck_outlives.rs
+++ b/src/librustc_traits/dropck_outlives.rs
@@ -16,14 +16,14 @@ use rustc::traits::query::dropck_outlives::{DtorckConstraint, DropckOutlivesResu
use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
use rustc::ty::subst::Subst;
use rustc::util::nodemap::FxHashSet;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
use syntax::codemap::{Span, DUMMY_SP};
use util;
crate fn dropck_outlives<'tcx>(
tcx: TyCtxt<'_, 'tcx, 'tcx>,
goal: CanonicalTyGoal<'tcx>,
-) -> Result<Rc<Canonical<'tcx, QueryResult<'tcx, DropckOutlivesResult<'tcx>>>>, NoSolution> {
+) -> Result<Lrc<Canonical<'tcx, QueryResult<'tcx, DropckOutlivesResult<'tcx>>>>, NoSolution> {
debug!("dropck_outlives(goal={:#?})", goal);
tcx.infer_ctxt().enter(|ref infcx| {
diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs
index 55785d9586cc3..62d5ef11551c0 100644
--- a/src/librustc_traits/normalize_projection_ty.rs
+++ b/src/librustc_traits/normalize_projection_ty.rs
@@ -14,7 +14,7 @@ use rustc::traits::{self, FulfillmentContext, Normalized, ObligationCause,
use rustc::traits::query::{CanonicalProjectionGoal, NoSolution, normalize::NormalizationResult};
use rustc::ty::{ParamEnvAnd, TyCtxt};
use rustc::util::common::CellUsizeExt;
-use std::rc::Rc;
+use rustc_data_structures::sync::Lrc;
use syntax::ast::DUMMY_NODE_ID;
use syntax_pos::DUMMY_SP;
use util;
@@ -22,7 +22,7 @@ use util;
crate fn normalize_projection_ty<'tcx>(
tcx: TyCtxt<'_, 'tcx, 'tcx>,
goal: CanonicalProjectionGoal<'tcx>,
-) -> Result<Rc<Canonical<'tcx, QueryResult<'tcx, NormalizationResult<'tcx>>>>, NoSolution> {
+) -> Result<Lrc<Canonical<'tcx, QueryResult<'tcx, NormalizationResult<'tcx>>>>, NoSolution> {
debug!("normalize_provider(goal={:#?})", goal);
tcx.sess.perf_stats.normalize_projection_ty.increment();
diff --git a/src/librustc_trans/attributes.rs b/src/librustc_trans/attributes.rs
index 040d9455334bc..df78ccdd2298a 100644
--- a/src/librustc_trans/attributes.rs
+++ b/src/librustc_trans/attributes.rs
@@ -11,11 +11,14 @@
use std::ffi::{CStr, CString};
-use rustc::hir::TransFnAttrFlags;
+use rustc::hir::{self, TransFnAttrFlags};
use rustc::hir::def_id::{DefId, LOCAL_CRATE};
+use rustc::hir::itemlikevisit::ItemLikeVisitor;
use rustc::session::config::Sanitizer;
+use rustc::ty::TyCtxt;
use rustc::ty::maps::Providers;
use rustc_data_structures::sync::Lrc;
+use rustc_data_structures::fx::FxHashMap;
use llvm::{self, Attribute, ValueRef};
use llvm::AttributePlace::Function;
@@ -139,6 +142,20 @@ pub fn from_fn_attrs(cx: &CodegenCx, llfn: ValueRef, id: DefId) {
llfn, llvm::AttributePlace::Function,
cstr("target-features\0"), &val);
}
+
+ // Note that currently the `wasm-import-module` doesn't do anything, but
+ // eventually LLVM 7 should read this and ferry the appropriate import
+ // module to the output file.
+ if cx.tcx.sess.target.target.arch == "wasm32" {
+ if let Some(module) = wasm_import_module(cx.tcx, id) {
+ llvm::AddFunctionAttrStringValue(
+ llfn,
+ llvm::AttributePlace::Function,
+ cstr("wasm-import-module\0"),
+ &module,
+ );
+ }
+ }
}
fn cstr(s: &'static str) -> &CStr {
@@ -161,4 +178,63 @@ pub fn provide(providers: &mut Providers) {
.collect())
}
};
+
+ providers.wasm_custom_sections = |tcx, cnum| {
+ assert_eq!(cnum, LOCAL_CRATE);
+ let mut finder = WasmSectionFinder { tcx, list: Vec::new() };
+ tcx.hir.krate().visit_all_item_likes(&mut finder);
+ Lrc::new(finder.list)
+ };
+
+ provide_extern(providers);
+}
+
+struct WasmSectionFinder<'a, 'tcx: 'a> {
+ tcx: TyCtxt<'a, 'tcx, 'tcx>,
+ list: Vec<DefId>,
+}
+
+impl<'a, 'tcx: 'a> ItemLikeVisitor<'tcx> for WasmSectionFinder<'a, 'tcx> {
+ fn visit_item(&mut self, i: &'tcx hir::Item) {
+ match i.node {
+ hir::ItemConst(..) => {}
+ _ => return,
+ }
+ if i.attrs.iter().any(|i| i.check_name("wasm_custom_section")) {
+ self.list.push(self.tcx.hir.local_def_id(i.id));
+ }
+ }
+
+ fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem) {}
+
+ fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem) {}
+}
+
+pub fn provide_extern(providers: &mut Providers) {
+ providers.wasm_import_module_map = |tcx, cnum| {
+ let mut ret = FxHashMap();
+ for lib in tcx.foreign_modules(cnum).iter() {
+ let attrs = tcx.get_attrs(lib.def_id);
+ let mut module = None;
+ for attr in attrs.iter().filter(|a| a.check_name("wasm_import_module")) {
+ module = attr.value_str();
+ }
+ let module = match module {
+ Some(s) => s,
+ None => continue,
+ };
+ for id in lib.foreign_items.iter() {
+ assert_eq!(id.krate, cnum);
+ ret.insert(*id, module.to_string());
+ }
+ }
+
+ Lrc::new(ret)
+ }
+}
+
+fn wasm_import_module(tcx: TyCtxt, id: DefId) -> Option<CString> {
+ tcx.wasm_import_module_map(id.krate)
+ .get(&id)
+ .map(|s| CString::new(&s[..]).unwrap())
}
diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
index bdda7741221f5..542cdc5baad32 100644
--- a/src/librustc_trans/back/link.rs
+++ b/src/librustc_trans/back/link.rs
@@ -8,6 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
+use back::wasm;
use cc::windows_registry;
use super::archive::{ArchiveBuilder, ArchiveConfig};
use super::bytecode::RLIB_BYTECODE_EXTENSION;
@@ -810,6 +811,12 @@ fn link_natively(sess: &Session,
Err(e) => sess.fatal(&format!("failed to run dsymutil: {}", e)),
}
}
+
+ if sess.opts.target_triple == "wasm32-unknown-unknown" {
+ wasm::rewrite_imports(&out_filename, &trans.crate_info.wasm_imports);
+ wasm::add_custom_sections(&out_filename,
+ &trans.crate_info.wasm_custom_sections);
+ }
}
fn exec_linker(sess: &Session, cmd: &mut Command, tmpdir: &Path)
diff --git a/src/librustc_trans/back/wasm.rs b/src/librustc_trans/back/wasm.rs
new file mode 100644
index 0000000000000..d6d386c9fbe77
--- /dev/null
+++ b/src/librustc_trans/back/wasm.rs
@@ -0,0 +1,261 @@
+// Copyright 2018 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.
+
+use std::collections::BTreeMap;
+use std::fs;
+use std::path::Path;
+use std::str;
+
+use rustc_data_structures::fx::FxHashMap;
+use serialize::leb128;
+
+// https://webassembly.github.io/spec/core/binary/modules.html#binary-importsec
+const WASM_IMPORT_SECTION_ID: u8 = 2;
+
+const WASM_EXTERNAL_KIND_FUNCTION: u8 = 0;
+const WASM_EXTERNAL_KIND_TABLE: u8 = 1;
+const WASM_EXTERNAL_KIND_MEMORY: u8 = 2;
+const WASM_EXTERNAL_KIND_GLOBAL: u8 = 3;
+
+/// Append all the custom sections listed in `sections` to the wasm binary
+/// specified at `path`.
+///
+/// LLVM 6 which we're using right now doesn't have the ability to create custom
+/// sections in wasm files nor does LLD have the ability to merge these sections
+/// into one larger section when linking. It's expected that this will
+/// eventually get implemented, however!
+///
+/// Until that time though this is a custom implementation in rustc to append
+/// all sections to a wasm file to the finished product that LLD produces.
+///
+/// Support for this is landing in LLVM in https://reviews.llvm.org/D43097,
+/// although after that support will need to be in LLD as well.
+pub fn add_custom_sections(path: &Path, sections: &BTreeMap<String, Vec<u8>>) {
+ if sections.len() == 0 {
+ return
+ }
+
+ let wasm = fs::read(path).expect("failed to read wasm output");
+
+ // see https://webassembly.github.io/spec/core/binary/modules.html#custom-section
+ let mut wasm = WasmEncoder { data: wasm };
+ for (section, bytes) in sections {
+ // write the `id` identifier, 0 for a custom section
+ wasm.byte(0);
+
+ // figure out how long our name descriptor will be
+ let mut name = WasmEncoder::new();
+ name.str(section);
+
+ // write the length of the payload followed by all its contents
+ wasm.u32((bytes.len() + name.data.len()) as u32);
+ wasm.data.extend_from_slice(&name.data);
+ wasm.data.extend_from_slice(bytes);
+ }
+
+ fs::write(path, &wasm.data).expect("failed to write wasm output");
+}
+
+/// Rewrite the module imports are listed from in a wasm module given the field
+/// name to module name mapping in `import_map`.
+///
+/// LLVM 6 which we're using right now doesn't have the ability to configure the
+/// module a wasm symbol is import from. Rather all imported symbols come from
+/// the bland `"env"` module unconditionally. Furthermore we'd *also* need
+/// support in LLD for preserving these import modules, which it unfortunately
+/// currently does not.
+///
+/// This function is intended as a hack for now where we manually rewrite the
+/// wasm output by LLVM to have the correct import modules listed. The
+/// `#[wasm_import_module]` attribute in Rust translates to the module that each
+/// symbol is imported from, so here we manually go through the wasm file,
+/// decode it, rewrite imports, and then rewrite the wasm module.
+///
+/// Support for this was added to LLVM in
+/// https://github.com/llvm-mirror/llvm/commit/0f32e1365, although support still
+/// needs to be added (AFAIK at the time of this writing) to LLD
+pub fn rewrite_imports(path: &Path, import_map: &FxHashMap<String, String>) {
+ if import_map.len() == 0 {
+ return
+ }
+
+ let wasm = fs::read(path).expect("failed to read wasm output");
+ let mut ret = WasmEncoder::new();
+ ret.data.extend(&wasm[..8]);
+
+ // skip the 8 byte wasm/version header
+ for (id, raw) in WasmSections(WasmDecoder::new(&wasm[8..])) {
+ ret.byte(id);
+ if id == WASM_IMPORT_SECTION_ID {
+ info!("rewriting import section");
+ let data = rewrite_import_section(
+ &mut WasmDecoder::new(raw),
+ import_map,
+ );
+ ret.bytes(&data);
+ } else {
+ info!("carry forward section {}, {} bytes long", id, raw.len());
+ ret.bytes(raw);
+ }
+ }
+
+ fs::write(path, &ret.data).expect("failed to write wasm output");
+
+ fn rewrite_import_section(
+ wasm: &mut WasmDecoder,
+ import_map: &FxHashMap<String, String>,
+ )
+ -> Vec<u8>
+ {
+ let mut dst = WasmEncoder::new();
+ let n = wasm.u32();
+ dst.u32(n);
+ info!("rewriting {} imports", n);
+ for _ in 0..n {
+ rewrite_import_entry(wasm, &mut dst, import_map);
+ }
+ return dst.data
+ }
+
+ fn rewrite_import_entry(wasm: &mut WasmDecoder,
+ dst: &mut WasmEncoder,
+ import_map: &FxHashMap<String, String>) {
+ // More info about the binary format here is available at:
+ // https://webassembly.github.io/spec/core/binary/modules.html#import-section
+ //
+ // Note that you can also find the whole point of existence of this
+ // function here, where we map the `module` name to a different one if
+ // we've got one listed.
+ let module = wasm.str();
+ let field = wasm.str();
+ let new_module = if module == "env" {
+ import_map.get(field).map(|s| &**s).unwrap_or(module)
+ } else {
+ module
+ };
+ info!("import rewrite ({} => {}) / {}", module, new_module, field);
+ dst.str(new_module);
+ dst.str(field);
+ let kind = wasm.byte();
+ dst.byte(kind);
+ match kind {
+ WASM_EXTERNAL_KIND_FUNCTION => dst.u32(wasm.u32()),
+ WASM_EXTERNAL_KIND_TABLE => {
+ dst.byte(wasm.byte()); // element_type
+ dst.limits(wasm.limits());
+ }
+ WASM_EXTERNAL_KIND_MEMORY => dst.limits(wasm.limits()),
+ WASM_EXTERNAL_KIND_GLOBAL => {
+ dst.byte(wasm.byte()); // content_type
+ dst.bool(wasm.bool()); // mutable
+ }
+ b => panic!("unknown kind: {}", b),
+ }
+ }
+}
+
+struct WasmSections<'a>(WasmDecoder<'a>);
+
+impl<'a> Iterator for WasmSections<'a> {
+ type Item = (u8, &'a [u8]);
+
+ fn next(&mut self) -> Option<(u8, &'a [u8])> {
+ if self.0.data.len() == 0 {
+ return None
+ }
+
+ // see https://webassembly.github.io/spec/core/binary/modules.html#sections
+ let id = self.0.byte();
+ let section_len = self.0.u32();
+ info!("new section {} / {} bytes", id, section_len);
+ let section = self.0.skip(section_len as usize);
+ Some((id, section))
+ }
+}
+
+struct WasmDecoder<'a> {
+ data: &'a [u8],
+}
+
+impl<'a> WasmDecoder<'a> {
+ fn new(data: &'a [u8]) -> WasmDecoder<'a> {
+ WasmDecoder { data }
+ }
+
+ fn byte(&mut self) -> u8 {
+ self.skip(1)[0]
+ }
+
+ fn u32(&mut self) -> u32 {
+ let (n, l1) = leb128::read_u32_leb128(self.data);
+ self.data = &self.data[l1..];
+ return n
+ }
+
+ fn skip(&mut self, amt: usize) -> &'a [u8] {
+ let (data, rest) = self.data.split_at(amt);
+ self.data = rest;
+ data
+ }
+
+ fn str(&mut self) -> &'a str {
+ let len = self.u32();
+ str::from_utf8(self.skip(len as usize)).unwrap()
+ }
+
+ fn bool(&mut self) -> bool {
+ self.byte() == 1
+ }
+
+ fn limits(&mut self) -> (u32, Option<u32>) {
+ let has_max = self.bool();
+ (self.u32(), if has_max { Some(self.u32()) } else { None })
+ }
+}
+
+struct WasmEncoder {
+ data: Vec<u8>,
+}
+
+impl WasmEncoder {
+ fn new() -> WasmEncoder {
+ WasmEncoder { data: Vec::new() }
+ }
+
+ fn u32(&mut self, val: u32) {
+ let at = self.data.len();
+ leb128::write_u32_leb128(&mut self.data, at, val);
+ }
+
+ fn byte(&mut self, val: u8) {
+ self.data.push(val);
+ }
+
+ fn bytes(&mut self, val: &[u8]) {
+ self.u32(val.len() as u32);
+ self.data.extend_from_slice(val);
+ }
+
+ fn str(&mut self, val: &str) {
+ self.bytes(val.as_bytes())
+ }
+
+ fn bool(&mut self, b: bool) {
+ self.byte(b as u8);
+ }
+
+ fn limits(&mut self, limits: (u32, Option<u32>)) {
+ self.bool(limits.1.is_some());
+ self.u32(limits.0);
+ if let Some(c) = limits.1 {
+ self.u32(c);
+ }
+ }
+}
diff --git a/src/librustc_trans/base.rs b/src/librustc_trans/base.rs
index 4da082e9d50f1..56eece9f31e7e 100644
--- a/src/librustc_trans/base.rs
+++ b/src/librustc_trans/base.rs
@@ -72,8 +72,10 @@ use type_::Type;
use type_of::LayoutLlvmExt;
use rustc::util::nodemap::{FxHashMap, FxHashSet, DefIdSet};
use CrateInfo;
+use rustc_data_structures::sync::Lrc;
use std::any::Any;
+use std::collections::BTreeMap;
use std::ffi::CString;
use std::str;
use std::sync::Arc;
@@ -1070,8 +1072,26 @@ impl CrateInfo {
used_crates_dynamic: cstore::used_crates(tcx, LinkagePreference::RequireDynamic),
used_crates_static: cstore::used_crates(tcx, LinkagePreference::RequireStatic),
used_crate_source: FxHashMap(),
+ wasm_custom_sections: BTreeMap::new(),
+ wasm_imports: FxHashMap(),
};
+ let load_wasm_items = tcx.sess.crate_types.borrow()
+ .iter()
+ .any(|c| *c != config::CrateTypeRlib) &&
+ tcx.sess.opts.target_triple == "wasm32-unknown-unknown";
+
+ if load_wasm_items {
+ info!("attempting to load all wasm sections");
+ for &id in tcx.wasm_custom_sections(LOCAL_CRATE).iter() {
+ let (name, contents) = fetch_wasm_section(tcx, id);
+ info.wasm_custom_sections.entry(name)
+ .or_insert(Vec::new())
+ .extend(contents);
+ }
+ info.load_wasm_imports(tcx, LOCAL_CRATE);
+ }
+
for &cnum in tcx.crates().iter() {
info.native_libraries.insert(cnum, tcx.native_libraries(cnum));
info.crate_name.insert(cnum, tcx.crate_name(cnum).to_string());
@@ -1091,11 +1111,27 @@ impl CrateInfo {
if tcx.is_no_builtins(cnum) {
info.is_no_builtins.insert(cnum);
}
+ if load_wasm_items {
+ for &id in tcx.wasm_custom_sections(cnum).iter() {
+ let (name, contents) = fetch_wasm_section(tcx, id);
+ info.wasm_custom_sections.entry(name)
+ .or_insert(Vec::new())
+ .extend(contents);
+ }
+ info.load_wasm_imports(tcx, cnum);
+ }
}
-
return info
}
+
+ fn load_wasm_imports(&mut self, tcx: TyCtxt, cnum: CrateNum) {
+ for (&id, module) in tcx.wasm_import_module_map(cnum).iter() {
+ let instance = Instance::mono(tcx, id);
+ let import_name = tcx.symbol_name(instance);
+ self.wasm_imports.insert(import_name.to_string(), module.clone());
+ }
+ }
}
fn is_translated_item(tcx: TyCtxt, id: DefId) -> bool {
@@ -1223,6 +1259,39 @@ pub fn provide(providers: &mut Providers) {
.expect(&format!("failed to find cgu with name {:?}", name))
};
providers.compile_codegen_unit = compile_codegen_unit;
+
+ provide_extern(providers);
+}
+
+pub fn provide_extern(providers: &mut Providers) {
+ providers.dllimport_foreign_items = |tcx, krate| {
+ let module_map = tcx.foreign_modules(krate);
+ let module_map = module_map.iter()
+ .map(|lib| (lib.def_id, lib))
+ .collect::<FxHashMap<_, _>>();
+
+ let dllimports = tcx.native_libraries(krate)
+ .iter()
+ .filter(|lib| {
+ if lib.kind != cstore::NativeLibraryKind::NativeUnknown {
+ return false
+ }
+ let cfg = match lib.cfg {
+ Some(ref cfg) => cfg,
+ None => return true,
+ };
+ attr::cfg_matches(cfg, &tcx.sess.parse_sess, None)
+ })
+ .filter_map(|lib| lib.foreign_module)
+ .map(|id| &module_map[&id])
+ .flat_map(|module| module.foreign_items.iter().cloned())
+ .collect();
+ Lrc::new(dllimports)
+ };
+
+ providers.is_dllimport_foreign_item = |tcx, def_id| {
+ tcx.dllimport_foreign_items(def_id.krate).contains(&def_id)
+ };
}
pub fn linkage_to_llvm(linkage: Linkage) -> llvm::Linkage {
@@ -1270,3 +1339,44 @@ mod temp_stable_hash_impls {
}
}
}
+
+fn fetch_wasm_section(tcx: TyCtxt, id: DefId) -> (String, Vec<u8>) {
+ use rustc::mir::interpret::{GlobalId, Value, PrimVal};
+ use rustc::middle::const_val::ConstVal;
+
+ info!("loading wasm section {:?}", id);
+
+ let section = tcx.get_attrs(id)
+ .iter()
+ .find(|a| a.check_name("wasm_custom_section"))
+ .expect("missing #[wasm_custom_section] attribute")
+ .value_str()
+ .expect("malformed #[wasm_custom_section] attribute");
+
+ let instance = ty::Instance::mono(tcx, id);
+ let cid = GlobalId {
+ instance,
+ promoted: None
+ };
+ let param_env = ty::ParamEnv::reveal_all();
+ let val = tcx.const_eval(param_env.and(cid)).unwrap();
+
+ let val = match val.val {
+ ConstVal::Value(val) => val,
+ ConstVal::Unevaluated(..) => bug!("should be evaluated"),
+ };
+ let val = match val {
+ Value::ByRef(ptr, _align) => ptr.into_inner_primval(),
+ ref v => bug!("should be ByRef, was {:?}", v),
+ };
+ let mem = match val {
+ PrimVal::Ptr(mem) => mem,
+ ref v => bug!("should be Ptr, was {:?}", v),
+ };
+ assert_eq!(mem.offset, 0);
+ let alloc = tcx
+ .interpret_interner
+ .get_alloc(mem.alloc_id)
+ .expect("miri allocation never successfully created");
+ (section.to_string(), alloc.bytes.clone())
+}
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index 337f85a381399..9f654c8ab29c0 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -72,6 +72,7 @@ pub use llvm_util::target_features;
use std::any::Any;
use std::path::PathBuf;
use std::sync::mpsc;
+use std::collections::BTreeMap;
use rustc_data_structures::sync::Lrc;
use rustc::dep_graph::DepGraph;
@@ -98,6 +99,7 @@ mod back {
pub mod symbol_export;
pub mod write;
mod rpath;
+ mod wasm;
}
mod abi;
@@ -214,6 +216,8 @@ impl TransCrate for LlvmTransCrate {
fn provide_extern(&self, providers: &mut ty::maps::Providers) {
back::symbol_export::provide_extern(providers);
+ base::provide_extern(providers);
+ attributes::provide_extern(providers);
}
fn trans_crate<'a, 'tcx>(
@@ -400,6 +404,8 @@ struct CrateInfo {
used_crate_source: FxHashMap<CrateNum, Lrc<CrateSource>>,
used_crates_static: Vec<(CrateNum, LibSource)>,
used_crates_dynamic: Vec<(CrateNum, LibSource)>,
+ wasm_custom_sections: BTreeMap<String, Vec<u8>>,
+ wasm_imports: FxHashMap<String, String>,
}
__build_diagnostic_array! { librustc_trans, DIAGNOSTICS }
diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
index 379fd93ba2bd6..7965806af5d09 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/src/librustc_typeck/check/_match.rs
@@ -904,6 +904,7 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
// Keep track of which fields have already appeared in the pattern.
let mut used_fields = FxHashMap();
+ let mut inexistent_fields = vec![];
// Typecheck each field.
for &Spanned { node: ref field, span } in fields {
let field_ty = match used_fields.entry(field.name) {
@@ -927,34 +928,7 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
self.field_ty(span, f, substs)
})
.unwrap_or_else(|| {
- let mut err = struct_span_err!(
- tcx.sess,
- span,
- E0026,
- "{} `{}` does not have a field named `{}`",
- kind_name,
- tcx.item_path_str(variant.did),
- field.name
- );
- err.span_label(span,
- format!("{} `{}` does not have field `{}`",
- kind_name,
- tcx.item_path_str(variant.did),
- field.name));
- if tcx.sess.teach(&err.get_code().unwrap()) {
- err.note(
- "This error indicates that a struct pattern attempted to \
- extract a non-existent field from a struct. Struct fields \
- are identified by the name used before the colon : so struct \
- patterns should resemble the declaration of the struct type \
- being matched.\n\n\
- If you are using shorthand field patterns but want to refer \
- to the struct field by a different name, you should rename \
- it explicitly."
- );
- }
- err.emit();
-
+ inexistent_fields.push((span, field.name));
tcx.types.err
})
}
@@ -963,6 +937,47 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
self.check_pat_walk(&field.pat, field_ty, def_bm, true);
}
+ if inexistent_fields.len() > 0 {
+ let (field_names, t, plural) = if inexistent_fields.len() == 1 {
+ (format!("a field named `{}`", inexistent_fields[0].1), "this", "")
+ } else {
+ (format!("fields named {}",
+ inexistent_fields.iter()
+ .map(|(_, name)| format!("`{}`", name))
+ .collect::<Vec<String>>()
+ .join(", ")), "these", "s")
+ };
+ let spans = inexistent_fields.iter().map(|(span, _)| *span).collect::<Vec<_>>();
+ let mut err = struct_span_err!(tcx.sess,
+ spans,
+ E0026,
+ "{} `{}` does not have {}",
+ kind_name,
+ tcx.item_path_str(variant.did),
+ field_names);
+ if let Some((span, _)) = inexistent_fields.last() {
+ err.span_label(*span,
+ format!("{} `{}` does not have {} field{}",
+ kind_name,
+ tcx.item_path_str(variant.did),
+ t,
+ plural));
+ }
+ if tcx.sess.teach(&err.get_code().unwrap()) {
+ err.note(
+ "This error indicates that a struct pattern attempted to \
+ extract a non-existent field from a struct. Struct fields \
+ are identified by the name used before the colon : so struct \
+ patterns should resemble the declaration of the struct type \
+ being matched.\n\n\
+ If you are using shorthand field patterns but want to refer \
+ to the struct field by a different name, you should rename \
+ it explicitly."
+ );
+ }
+ err.emit();
+ }
+
// Require `..` if struct has non_exhaustive attribute.
if adt.is_struct() && adt.is_non_exhaustive() && !adt.did.is_local() && !etc {
span_err!(tcx.sess, span, E0638,
@@ -979,13 +994,25 @@ https://doc.rust-lang.org/reference/types.html#trait-objects");
tcx.sess.span_err(span, "`..` cannot be used in union patterns");
}
} else if !etc {
- for field in variant.fields
+ let unmentioned_fields = variant.fields
.iter()
- .filter(|field| !used_fields.contains_key(&field.name)) {
+ .map(|field| field.name)
+ .filter(|field| !used_fields.contains_key(&field))
+ .collect::<Vec<_>>();
+ if unmentioned_fields.len() > 0 {
+ let field_names = if unmentioned_fields.len() == 1 {
+ format!("field `{}`", unmentioned_fields[0])
+ } else {
+ format!("fields {}",
+ unmentioned_fields.iter()
+ .map(|name| format!("`{}`", name))
+ .collect::<Vec<String>>()
+ .join(", "))
+ };
let mut diag = struct_span_err!(tcx.sess, span, E0027,
- "pattern does not mention field `{}`",
- field.name);
- diag.span_label(span, format!("missing field `{}`", field.name));
+ "pattern does not mention {}",
+ field_names);
+ diag.span_label(span, format!("missing {}", field_names));
if variant.ctor_kind == CtorKind::Fn {
diag.note("trying to match a tuple variant with a struct variant pattern");
}
diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs
index 4d344eb279903..c7921d2bd4588 100644
--- a/src/librustc_typeck/check/method/probe.rs
+++ b/src/librustc_typeck/check/method/probe.rs
@@ -326,7 +326,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
if reached_raw_pointer
&& !self.tcx.features().arbitrary_self_types {
// this case used to be allowed by the compiler,
- // so we do a future-compat lint here for the 2015 epoch
+ // so we do a future-compat lint here for the 2015 edition
// (see https://github.com/rust-lang/rust/issues/46906)
if self.tcx.sess.rust_2018() {
span_err!(self.tcx.sess, span, E0908,
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 69879bbe85d6e..f86fe1fb75643 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -1182,9 +1182,15 @@ pub fn check_item_type<'a,'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, it: &'tcx hir::Item
let _indenter = indenter();
match it.node {
// Consts can play a role in type-checking, so they are included here.
- hir::ItemStatic(..) |
+ hir::ItemStatic(..) => {
+ tcx.typeck_tables_of(tcx.hir.local_def_id(it.id));
+ }
hir::ItemConst(..) => {
tcx.typeck_tables_of(tcx.hir.local_def_id(it.id));
+ if it.attrs.iter().any(|a| a.check_name("wasm_custom_section")) {
+ let def_id = tcx.hir.local_def_id(it.id);
+ check_const_is_u8_array(tcx, def_id, it.span);
+ }
}
hir::ItemEnum(ref enum_definition, _) => {
check_enum(tcx,
@@ -1256,6 +1262,21 @@ pub fn check_item_type<'a,'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, it: &'tcx hir::Item
}
}
+fn check_const_is_u8_array<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
+ def_id: DefId,
+ span: Span) {
+ match tcx.type_of(def_id).sty {
+ ty::TyArray(t, _) => {
+ match t.sty {
+ ty::TyUint(ast::UintTy::U8) => return,
+ _ => {}
+ }
+ }
+ _ => {}
+ }
+ tcx.sess.span_err(span, "must be an array of bytes like `[u8; N]`");
+}
+
fn check_on_unimplemented<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
trait_def_id: DefId,
item: &hir::Item) {
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index 659ec8a993dc8..cfa3f5a4e0b4f 100644
--- a/src/librustdoc/html/highlight.rs
+++ b/src/librustdoc/html/highlight.rs
@@ -323,12 +323,12 @@ impl<'a> Classifier<'a> {
}
// Keywords are also included in the identifier set.
- token::Ident(ident) => {
+ token::Ident(ident, is_raw) => {
match &*ident.name.as_str() {
- "ref" | "mut" => Class::RefKeyWord,
+ "ref" | "mut" if !is_raw => Class::RefKeyWord,
- "self" |"Self" => Class::Self_,
- "false" | "true" => Class::Bool,
+ "self" | "Self" => Class::Self_,
+ "false" | "true" if !is_raw => Class::Bool,
"Option" | "Result" => Class::PreludeTy,
"Some" | "None" | "Ok" | "Err" => Class::PreludeVal,
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 62bef4bc49913..36eb729182210 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -282,6 +282,7 @@
#![feature(macro_vis_matcher)]
#![feature(needs_panic_runtime)]
#![feature(exhaustive_patterns)]
+#![feature(nonzero)]
#![feature(num_bits_bytes)]
#![feature(old_wrapping)]
#![feature(on_unimplemented)]
diff --git a/src/libstd/num.rs b/src/libstd/num.rs
index 33d7053852246..6f537fd5c50e1 100644
--- a/src/libstd/num.rs
+++ b/src/libstd/num.rs
@@ -21,6 +21,17 @@ pub use core::num::{FpCategory, ParseIntError, ParseFloatError, TryFromIntError}
#[stable(feature = "rust1", since = "1.0.0")]
pub use core::num::Wrapping;
+#[unstable(feature = "nonzero", issue = "49137")]
+pub use core::num::{
+ NonZeroU8, NonZeroI8, NonZeroU16, NonZeroI16, NonZeroU32, NonZeroI32,
+ NonZeroU64, NonZeroI64, NonZeroUsize, NonZeroIsize,
+};
+
+// Change this to `#[unstable(feature = "i128", issue = "35118")]`
+// if other NonZero* integer types are stabilizied before 128-bit integers
+#[unstable(feature = "nonzero", issue = "49137")]
+pub use core::num::{NonZeroU128, NonZeroI128};
+
#[cfg(test)] use fmt;
#[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem};
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs
index 3f65975e60880..04d9f0b06d344 100644
--- a/src/libstd/sys/unix/net.rs
+++ b/src/libstd/sys/unix/net.rs
@@ -383,12 +383,12 @@ impl IntoInner<c_int> for Socket {
// believe it's thread-safe).
#[cfg(target_env = "gnu")]
fn on_resolver_failure() {
+ use sys;
+
// If the version fails to parse, we treat it the same as "not glibc".
- if let Some(Ok(version_str)) = glibc_version_cstr().map(CStr::to_str) {
- if let Some(version) = parse_glibc_version(version_str) {
- if version < (2, 26) {
- unsafe { libc::res_init() };
- }
+ if let Some(version) = sys::os::glibc_version() {
+ if version < (2, 26) {
+ unsafe { libc::res_init() };
}
}
}
@@ -396,29 +396,6 @@ fn on_resolver_failure() {
#[cfg(not(target_env = "gnu"))]
fn on_resolver_failure() {}
-#[cfg(target_env = "gnu")]
-fn glibc_version_cstr() -> Option<&'static CStr> {
- weak! {
- fn gnu_get_libc_version() -> *const libc::c_char
- }
- if let Some(f) = gnu_get_libc_version.get() {
- unsafe { Some(CStr::from_ptr(f())) }
- } else {
- None
- }
-}
-
-// Returns Some((major, minor)) if the string is a valid "x.y" version,
-// ignoring any extra dot-separated parts. Otherwise return None.
-#[cfg(target_env = "gnu")]
-fn parse_glibc_version(version: &str) -> Option<(usize, usize)> {
- let mut parsed_ints = version.split(".").map(str::parse::<usize>).fuse();
- match (parsed_ints.next(), parsed_ints.next()) {
- (Some(Ok(major)), Some(Ok(minor))) => Some((major, minor)),
- _ => None
- }
-}
-
#[cfg(all(test, taget_env = "gnu"))]
mod test {
use super::*;
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
index a46e855b4a6f4..4c86fddee4b45 100644
--- a/src/libstd/sys/unix/os.rs
+++ b/src/libstd/sys/unix/os.rs
@@ -546,3 +546,35 @@ pub fn getpid() -> u32 {
pub fn getppid() -> u32 {
unsafe { libc::getppid() as u32 }
}
+
+#[cfg(target_env = "gnu")]
+pub fn glibc_version() -> Option<(usize, usize)> {
+ if let Some(Ok(version_str)) = glibc_version_cstr().map(CStr::to_str) {
+ parse_glibc_version(version_str)
+ } else {
+ None
+ }
+}
+
+#[cfg(target_env = "gnu")]
+fn glibc_version_cstr() -> Option<&'static CStr> {
+ weak! {
+ fn gnu_get_libc_version() -> *const libc::c_char
+ }
+ if let Some(f) = gnu_get_libc_version.get() {
+ unsafe { Some(CStr::from_ptr(f())) }
+ } else {
+ None
+ }
+}
+
+// Returns Some((major, minor)) if the string is a valid "x.y" version,
+// ignoring any extra dot-separated parts. Otherwise return None.
+#[cfg(target_env = "gnu")]
+fn parse_glibc_version(version: &str) -> Option<(usize, usize)> {
+ let mut parsed_ints = version.split(".").map(str::parse::<usize>).fuse();
+ match (parsed_ints.next(), parsed_ints.next()) {
+ (Some(Ok(major)), Some(Ok(minor))) => Some((major, minor)),
+ _ => None
+ }
+}
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs
index d0486f06a143a..b7f30600b8a4c 100644
--- a/src/libstd/sys/unix/process/process_common.rs
+++ b/src/libstd/sys/unix/process/process_common.rs
@@ -184,6 +184,10 @@ impl Command {
let maybe_env = self.env.capture_if_changed();
maybe_env.map(|env| construct_envp(env, &mut self.saw_nul))
}
+ #[allow(dead_code)]
+ pub fn env_saw_path(&self) -> bool {
+ self.env.have_changed_path()
+ }
pub fn setup_io(&self, default: Stdio, needs_stdin: bool)
-> io::Result<(StdioPipes, ChildPipes)> {
diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs
index 189280a4ba9a8..9d6d607e3f340 100644
--- a/src/libstd/sys/unix/process/process_unix.rs
+++ b/src/libstd/sys/unix/process/process_unix.rs
@@ -34,6 +34,11 @@ impl Command {
}
let (ours, theirs) = self.setup_io(default, needs_stdin)?;
+
+ if let Some(ret) = self.posix_spawn(&theirs, envp.as_ref())? {
+ return Ok((ret, ours))
+ }
+
let (input, output) = sys::pipe::anon_pipe()?;
let pid = unsafe {
@@ -229,6 +234,119 @@ impl Command {
libc::execvp(self.get_argv()[0], self.get_argv().as_ptr());
io::Error::last_os_error()
}
+
+ #[cfg(not(any(target_os = "macos", target_os = "freebsd",
+ all(target_os = "linux", target_env = "gnu"))))]
+ fn posix_spawn(&mut self, _: &ChildPipes, _: Option<&CStringArray>)
+ -> io::Result<Option<Process>>
+ {
+ Ok(None)
+ }
+
+ // Only support platforms for which posix_spawn() can return ENOENT
+ // directly.
+ #[cfg(any(target_os = "macos", target_os = "freebsd",
+ all(target_os = "linux", target_env = "gnu")))]
+ fn posix_spawn(&mut self, stdio: &ChildPipes, envp: Option<&CStringArray>)
+ -> io::Result<Option<Process>>
+ {
+ use mem;
+ use sys;
+
+ if self.get_cwd().is_some() ||
+ self.get_gid().is_some() ||
+ self.get_uid().is_some() ||
+ self.env_saw_path() ||
+ self.get_closures().len() != 0 {
+ return Ok(None)
+ }
+
+ // Only glibc 2.24+ posix_spawn() supports returning ENOENT directly.
+ #[cfg(all(target_os = "linux", target_env = "gnu"))]
+ {
+ if let Some(version) = sys::os::glibc_version() {
+ if version < (2, 24) {
+ return Ok(None)
+ }
+ } else {
+ return Ok(None)
+ }
+ }
+
+ let mut p = Process { pid: 0, status: None };
+
+ struct PosixSpawnFileActions(libc::posix_spawn_file_actions_t);
+
+ impl Drop for PosixSpawnFileActions {
+ fn drop(&mut self) {
+ unsafe {
+ libc::posix_spawn_file_actions_destroy(&mut self.0);
+ }
+ }
+ }
+
+ struct PosixSpawnattr(libc::posix_spawnattr_t);
+
+ impl Drop for PosixSpawnattr {
+ fn drop(&mut self) {
+ unsafe {
+ libc::posix_spawnattr_destroy(&mut self.0);
+ }
+ }
+ }
+
+ unsafe {
+ let mut file_actions = PosixSpawnFileActions(mem::uninitialized());
+ let mut attrs = PosixSpawnattr(mem::uninitialized());
+
+ libc::posix_spawnattr_init(&mut attrs.0);
+ libc::posix_spawn_file_actions_init(&mut file_actions.0);
+
+ if let Some(fd) = stdio.stdin.fd() {
+ cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
+ fd,
+ libc::STDIN_FILENO))?;
+ }
+ if let Some(fd) = stdio.stdout.fd() {
+ cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
+ fd,
+ libc::STDOUT_FILENO))?;
+ }
+ if let Some(fd) = stdio.stderr.fd() {
+ cvt(libc::posix_spawn_file_actions_adddup2(&mut file_actions.0,
+ fd,
+ libc::STDERR_FILENO))?;
+ }
+
+ let mut set: libc::sigset_t = mem::uninitialized();
+ cvt(libc::sigemptyset(&mut set))?;
+ cvt(libc::posix_spawnattr_setsigmask(&mut attrs.0,
+ &set))?;
+ cvt(libc::sigaddset(&mut set, libc::SIGPIPE))?;
+ cvt(libc::posix_spawnattr_setsigdefault(&mut attrs.0,
+ &set))?;
+
+ let flags = libc::POSIX_SPAWN_SETSIGDEF |
+ libc::POSIX_SPAWN_SETSIGMASK;
+ cvt(libc::posix_spawnattr_setflags(&mut attrs.0, flags as _))?;
+
+ let envp = envp.map(|c| c.as_ptr())
+ .unwrap_or(*sys::os::environ() as *const _);
+ let ret = libc::posix_spawnp(
+ &mut p.pid,
+ self.get_argv()[0],
+ &file_actions.0,
+ &attrs.0,
+ self.get_argv().as_ptr() as *const _,
+ envp as *const _,
+ );
+ if ret == 0 {
+ Ok(Some(p))
+ } else {
+ Err(io::Error::from_raw_os_error(ret))
+ }
+ }
+ }
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/libstd/sys_common/process.rs b/src/libstd/sys_common/process.rs
index fd1a5fdb4109b..d0c5951bd6c0a 100644
--- a/src/libstd/sys_common/process.rs
+++ b/src/libstd/sys_common/process.rs
@@ -47,6 +47,7 @@ impl EnvKey for DefaultEnvKey {}
#[derive(Clone, Debug)]
pub struct CommandEnv<K> {
clear: bool,
+ saw_path: bool,
vars: BTreeMap<K, Option<OsString>>
}
@@ -54,6 +55,7 @@ impl<K: EnvKey> Default for CommandEnv<K> {
fn default() -> Self {
CommandEnv {
clear: false,
+ saw_path: false,
vars: Default::default()
}
}
@@ -108,9 +110,11 @@ impl<K: EnvKey> CommandEnv<K> {
// The following functions build up changes
pub fn set(&mut self, key: &OsStr, value: &OsStr) {
+ self.maybe_saw_path(&key);
self.vars.insert(key.to_owned().into(), Some(value.to_owned()));
}
pub fn remove(&mut self, key: &OsStr) {
+ self.maybe_saw_path(&key);
if self.clear {
self.vars.remove(key);
} else {
@@ -121,4 +125,12 @@ impl<K: EnvKey> CommandEnv<K> {
self.clear = true;
self.vars.clear();
}
+ pub fn have_changed_path(&self) -> bool {
+ self.saw_path || self.clear
+ }
+ fn maybe_saw_path(&mut self, key: &OsStr) {
+ if !self.saw_path && key == "PATH" {
+ self.saw_path = true;
+ }
+ }
}
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 1f16b728cd239..a3af6b247ee2f 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -112,7 +112,7 @@ impl Path {
// or starts with something like `self`/`super`/`$crate`/etc.
pub fn make_root(&self) -> Option<PathSegment> {
if let Some(ident) = self.segments.get(0).map(|seg| seg.identifier) {
- if ::parse::token::Ident(ident).is_path_segment_keyword() &&
+ if ::parse::token::is_path_segment_keyword(ident) &&
ident.name != keywords::Crate.name() {
return None;
}
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index f2cdcda98da51..5954b9eb27475 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -1106,7 +1106,8 @@ impl IntType {
impl MetaItem {
fn tokens(&self) -> TokenStream {
- let ident = TokenTree::Token(self.span, Token::Ident(Ident::with_empty_ctxt(self.name)));
+ let ident = TokenTree::Token(self.span,
+ Token::from_ast_ident(Ident::with_empty_ctxt(self.name)));
TokenStream::concat(vec![ident.into(), self.node.tokens(self.span)])
}
@@ -1114,9 +1115,9 @@ impl MetaItem {
where I: Iterator<Item = TokenTree>,
{
let (span, name) = match tokens.next() {
- Some(TokenTree::Token(span, Token::Ident(ident))) => (span, ident.name),
+ Some(TokenTree::Token(span, Token::Ident(ident, _))) => (span, ident.name),
Some(TokenTree::Token(_, Token::Interpolated(ref nt))) => match nt.0 {
- token::Nonterminal::NtIdent(ident) => (ident.span, ident.node.name),
+ token::Nonterminal::NtIdent(ident, _) => (ident.span, ident.node.name),
token::Nonterminal::NtMeta(ref meta) => return Some(meta.clone()),
_ => return None,
},
@@ -1269,14 +1270,14 @@ impl LitKind {
"true"
} else {
"false"
- }))),
+ })), false),
}
}
fn from_token(token: Token) -> Option<LitKind> {
match token {
- Token::Ident(ident) if ident.name == "true" => Some(LitKind::Bool(true)),
- Token::Ident(ident) if ident.name == "false" => Some(LitKind::Bool(false)),
+ Token::Ident(ident, false) if ident.name == "true" => Some(LitKind::Bool(true)),
+ Token::Ident(ident, false) if ident.name == "false" => Some(LitKind::Bool(false)),
Token::Interpolated(ref nt) => match nt.0 {
token::NtExpr(ref v) => match v.node {
ExprKind::Lit(ref lit) => Some(lit.node.clone()),
diff --git a/src/libsyntax/config.rs b/src/libsyntax/config.rs
index 6013c20daf235..56b1306e5b33f 100644
--- a/src/libsyntax/config.rs
+++ b/src/libsyntax/config.rs
@@ -13,7 +13,7 @@ use feature_gate::{feature_err, EXPLAIN_STMT_ATTR_SYNTAX, Features, get_features
use {fold, attr};
use ast;
use codemap::Spanned;
-use epoch::Epoch;
+use edition::Edition;
use parse::{token, ParseSess};
use ptr::P;
@@ -27,7 +27,7 @@ pub struct StripUnconfigured<'a> {
}
// `cfg_attr`-process the crate's attributes and compute the crate's features.
-pub fn features(mut krate: ast::Crate, sess: &ParseSess, should_test: bool, epoch: Epoch)
+pub fn features(mut krate: ast::Crate, sess: &ParseSess, should_test: bool, edition: Edition)
-> (ast::Crate, Features) {
let features;
{
@@ -47,7 +47,7 @@ pub fn features(mut krate: ast::Crate, sess: &ParseSess, should_test: bool, epoc
return (krate, Features::new());
}
- features = get_features(&sess.span_diagnostic, &krate.attrs, epoch);
+ features = get_features(&sess.span_diagnostic, &krate.attrs, edition);
// Avoid reconfiguring malformed `cfg_attr`s
if err_count == sess.span_diagnostic.err_count() {
diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs
index 2c91844da96d7..aecf32ab6afb7 100644
--- a/src/libsyntax/diagnostics/plugin.rs
+++ b/src/libsyntax/diagnostics/plugin.rs
@@ -44,7 +44,7 @@ pub fn expand_diagnostic_used<'cx>(ecx: &'cx mut ExtCtxt,
token_tree: &[TokenTree])
-> Box<MacResult+'cx> {
let code = match (token_tree.len(), token_tree.get(0)) {
- (1, Some(&TokenTree::Token(_, token::Ident(code)))) => code,
+ (1, Some(&TokenTree::Token(_, token::Ident(code, _)))) => code,
_ => unreachable!()
};
@@ -82,10 +82,10 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt,
token_tree.get(1),
token_tree.get(2)
) {
- (1, Some(&TokenTree::Token(_, token::Ident(ref code))), None, None) => {
+ (1, Some(&TokenTree::Token(_, token::Ident(ref code, _))), None, None) => {
(code, None)
},
- (3, Some(&TokenTree::Token(_, token::Ident(ref code))),
+ (3, Some(&TokenTree::Token(_, token::Ident(ref code, _))),
Some(&TokenTree::Token(_, token::Comma)),
Some(&TokenTree::Token(_, token::Literal(token::StrRaw(description, _), None)))) => {
(code, Some(description))
@@ -150,9 +150,9 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt,
let (crate_name, name) = match (&token_tree[0], &token_tree[2]) {
(
// Crate name.
- &TokenTree::Token(_, token::Ident(ref crate_name)),
+ &TokenTree::Token(_, token::Ident(ref crate_name, _)),
// DIAGNOSTICS ident.
- &TokenTree::Token(_, token::Ident(ref name))
+ &TokenTree::Token(_, token::Ident(ref name, _))
) => (*&crate_name, name),
_ => unreachable!()
};
diff --git a/src/libsyntax/epoch.rs b/src/libsyntax/edition.rs
similarity index 56%
rename from src/libsyntax/epoch.rs
rename to src/libsyntax/edition.rs
index 32cbc79c550e3..61246d4493ca3 100644
--- a/src/libsyntax/epoch.rs
+++ b/src/libsyntax/edition.rs
@@ -11,58 +11,58 @@
use std::fmt;
use std::str::FromStr;
-/// The epoch of the compiler (RFC 2052)
+/// The edition of the compiler (RFC 2052)
#[derive(Clone, Copy, Hash, PartialOrd, Ord, Eq, PartialEq, Debug)]
#[non_exhaustive]
-pub enum Epoch {
- // epochs must be kept in order, newest to oldest
+pub enum Edition {
+ // editions must be kept in order, newest to oldest
- /// The 2015 epoch
- Epoch2015,
- /// The 2018 epoch
- Epoch2018,
+ /// The 2015 edition
+ Edition2015,
+ /// The 2018 edition
+ Edition2018,
- // when adding new epochs, be sure to update:
+ // when adding new editions, be sure to update:
//
- // - the list in the `parse_epoch` static in librustc::session::config
+ // - the list in the `parse_edition` static in librustc::session::config
// - add a `rust_####()` function to the session
// - update the enum in Cargo's sources as well
//
- // When -Zepoch becomes --epoch, there will
- // also be a check for the epoch being nightly-only
+ // When -Zedition becomes --edition, there will
+ // also be a check for the edition being nightly-only
// somewhere. That will need to be updated
- // whenever we're stabilizing/introducing a new epoch
+ // whenever we're stabilizing/introducing a new edition
// as well as changing the default Cargo template.
}
// must be in order from oldest to newest
-pub const ALL_EPOCHS: &[Epoch] = &[Epoch::Epoch2015, Epoch::Epoch2018];
+pub const ALL_EDITIONS: &[Edition] = &[Edition::Edition2015, Edition::Edition2018];
-impl fmt::Display for Epoch {
+impl fmt::Display for Edition {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let s = match *self {
- Epoch::Epoch2015 => "2015",
- Epoch::Epoch2018 => "2018",
+ Edition::Edition2015 => "2015",
+ Edition::Edition2018 => "2018",
};
write!(f, "{}", s)
}
}
-impl Epoch {
+impl Edition {
pub fn lint_name(&self) -> &'static str {
match *self {
- Epoch::Epoch2015 => "epoch_2015",
- Epoch::Epoch2018 => "epoch_2018",
+ Edition::Edition2015 => "edition_2015",
+ Edition::Edition2018 => "edition_2018",
}
}
}
-impl FromStr for Epoch {
+impl FromStr for Edition {
type Err = ();
fn from_str(s: &str) -> Result<Self, ()> {
match s {
- "2015" => Ok(Epoch::Epoch2015),
- "2018" => Ok(Epoch::Epoch2018),
+ "2015" => Ok(Edition::Edition2015),
+ "2018" => Ok(Edition::Edition2018),
_ => Err(())
}
}
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 23c42972912a1..c3ae0fd2ca863 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -229,8 +229,9 @@ impl<F> TTMacroExpander for F
impl Folder for AvoidInterpolatedIdents {
fn fold_tt(&mut self, tt: tokenstream::TokenTree) -> tokenstream::TokenTree {
if let tokenstream::TokenTree::Token(_, token::Interpolated(ref nt)) = tt {
- if let token::NtIdent(ident) = nt.0 {
- return tokenstream::TokenTree::Token(ident.span, token::Ident(ident.node));
+ if let token::NtIdent(ident, is_raw) = nt.0 {
+ return tokenstream::TokenTree::Token(ident.span,
+ token::Ident(ident.node, is_raw));
}
}
fold::noop_fold_tt(tt, self)
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index 6844532e7b375..540a03ff032ff 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -75,7 +75,7 @@ pub mod rt {
impl ToTokens for ast::Ident {
fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
- vec![TokenTree::Token(DUMMY_SP, token::Ident(*self))]
+ vec![TokenTree::Token(DUMMY_SP, Token::from_ast_ident(*self))]
}
}
@@ -238,7 +238,9 @@ pub mod rt {
if i > 0 {
inner.push(TokenTree::Token(self.span, token::Colon).into());
}
- inner.push(TokenTree::Token(self.span, token::Ident(segment.identifier)).into());
+ inner.push(TokenTree::Token(
+ self.span, token::Token::from_ast_ident(segment.identifier)
+ ).into());
}
inner.push(self.tokens.clone());
@@ -658,10 +660,10 @@ fn expr_mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> P<ast::Expr> {
token::Literal(token::ByteStr(i), suf) => return mk_lit!("ByteStr", suf, i),
token::Literal(token::ByteStrRaw(i, n), suf) => return mk_lit!("ByteStrRaw", suf, i, n),
- token::Ident(ident) => {
+ token::Ident(ident, is_raw) => {
return cx.expr_call(sp,
mk_token_path(cx, sp, "Ident"),
- vec![mk_ident(cx, sp, ident)]);
+ vec![mk_ident(cx, sp, ident), cx.expr_bool(sp, is_raw)]);
}
token::Lifetime(ident) => {
@@ -720,7 +722,7 @@ fn expr_mk_token(cx: &ExtCtxt, sp: Span, tok: &token::Token) -> P<ast::Expr> {
fn statements_mk_tt(cx: &ExtCtxt, tt: &TokenTree, quoted: bool) -> Vec<ast::Stmt> {
match *tt {
- TokenTree::Token(sp, token::Ident(ident)) if quoted => {
+ TokenTree::Token(sp, token::Ident(ident, _)) if quoted => {
// tt.extend($ident.to_tokens(ext_cx))
let e_to_toks =
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs
index 667653b5f7f26..8cb331c65da28 100644
--- a/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@ -364,8 +364,8 @@ pub fn parse_failure_msg(tok: Token) -> String {
/// Perform a token equality check, ignoring syntax context (that is, an unhygienic comparison)
fn token_name_eq(t1: &Token, t2: &Token) -> bool {
- if let (Some(id1), Some(id2)) = (t1.ident(), t2.ident()) {
- id1.name == id2.name
+ if let (Some((id1, is_raw1)), Some((id2, is_raw2))) = (t1.ident(), t2.ident()) {
+ id1.name == id2.name && is_raw1 == is_raw2
} else if let (&token::Lifetime(id1), &token::Lifetime(id2)) = (t1, t2) {
id1.name == id2.name
} else {
@@ -711,9 +711,10 @@ pub fn parse(
/// The token is an identifier, but not `_`.
/// We prohibit passing `_` to macros expecting `ident` for now.
-fn get_macro_ident(token: &Token) -> Option<Ident> {
+fn get_macro_ident(token: &Token) -> Option<(Ident, bool)> {
match *token {
- token::Ident(ident) if ident.name != keywords::Underscore.name() => Some(ident),
+ token::Ident(ident, is_raw) if ident.name != keywords::Underscore.name() =>
+ Some((ident, is_raw)),
_ => None,
}
}
@@ -737,7 +738,7 @@ fn may_begin_with(name: &str, token: &Token) -> bool {
"ident" => get_macro_ident(token).is_some(),
"vis" => match *token {
// The follow-set of :vis + "priv" keyword + interpolated
- Token::Comma | Token::Ident(_) | Token::Interpolated(_) => true,
+ Token::Comma | Token::Ident(..) | Token::Interpolated(_) => true,
_ => token.can_begin_type(),
},
"block" => match *token {
@@ -746,7 +747,7 @@ fn may_begin_with(name: &str, token: &Token) -> bool {
token::NtItem(_)
| token::NtPat(_)
| token::NtTy(_)
- | token::NtIdent(_)
+ | token::NtIdent(..)
| token::NtMeta(_)
| token::NtPath(_)
| token::NtVis(_) => false, // none of these may start with '{'.
@@ -755,7 +756,7 @@ fn may_begin_with(name: &str, token: &Token) -> bool {
_ => false,
},
"path" | "meta" => match *token {
- Token::ModSep | Token::Ident(_) => true,
+ Token::ModSep | Token::Ident(..) => true,
Token::Interpolated(ref nt) => match nt.0 {
token::NtPath(_) | token::NtMeta(_) => true,
_ => may_be_ident(&nt.0),
@@ -763,7 +764,7 @@ fn may_begin_with(name: &str, token: &Token) -> bool {
_ => false,
},
"pat" => match *token {
- Token::Ident(_) | // box, ref, mut, and other identifiers (can stricten)
+ Token::Ident(..) | // box, ref, mut, and other identifiers (can stricten)
Token::OpenDelim(token::Paren) | // tuple pattern
Token::OpenDelim(token::Bracket) | // slice pattern
Token::BinOp(token::And) | // reference
@@ -823,9 +824,9 @@ fn parse_nt<'a>(p: &mut Parser<'a>, sp: Span, name: &str) -> Nonterminal {
"expr" => token::NtExpr(panictry!(p.parse_expr())),
"ty" => token::NtTy(panictry!(p.parse_ty())),
// this could be handled like a token, since it is one
- "ident" => if let Some(ident) = get_macro_ident(&p.token) {
+ "ident" => if let Some((ident, is_raw)) = get_macro_ident(&p.token) {
p.bump();
- token::NtIdent(respan(p.prev_span, ident))
+ token::NtIdent(respan(p.prev_span, ident), is_raw)
} else {
let token_str = pprust::token_to_string(&p.token);
p.fatal(&format!("expected ident, found {}", &token_str)).emit();
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index a4b2c3990f5e1..10e5926eb9e36 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -831,7 +831,7 @@ fn is_in_follow(tok: "ed::TokenTree, frag: &str) -> Result<bool, (String, &'
"pat" => match *tok {
TokenTree::Token(_, ref tok) => match *tok {
FatArrow | Comma | Eq | BinOp(token::Or) => Ok(true),
- Ident(i) if i.name == "if" || i.name == "in" => Ok(true),
+ Ident(i, false) if i.name == "if" || i.name == "in" => Ok(true),
_ => Ok(false)
},
_ => Ok(false),
@@ -840,7 +840,7 @@ fn is_in_follow(tok: "ed::TokenTree, frag: &str) -> Result<bool, (String, &'
TokenTree::Token(_, ref tok) => match *tok {
OpenDelim(token::DelimToken::Brace) | OpenDelim(token::DelimToken::Bracket) |
Comma | FatArrow | Colon | Eq | Gt | Semi | BinOp(token::Or) => Ok(true),
- Ident(i) if i.name == "as" || i.name == "where" => Ok(true),
+ Ident(i, false) if i.name == "as" || i.name == "where" => Ok(true),
_ => Ok(false)
},
TokenTree::MetaVarDecl(_, _, frag) if frag.name == "block" => Ok(true),
@@ -860,7 +860,7 @@ fn is_in_follow(tok: "ed::TokenTree, frag: &str) -> Result<bool, (String, &'
match *tok {
TokenTree::Token(_, ref tok) => match *tok {
Comma => Ok(true),
- Ident(i) if i.name != "priv" => Ok(true),
+ Ident(i, is_raw) if is_raw || i.name != "priv" => Ok(true),
ref tok => Ok(tok.can_begin_type())
},
TokenTree::MetaVarDecl(_, _, frag) if frag.name == "ident"
diff --git a/src/libsyntax/ext/tt/quoted.rs b/src/libsyntax/ext/tt/quoted.rs
index 122bb9ba024a4..f324edeb1178a 100644
--- a/src/libsyntax/ext/tt/quoted.rs
+++ b/src/libsyntax/ext/tt/quoted.rs
@@ -200,7 +200,7 @@ pub fn parse(
let span = match trees.next() {
Some(tokenstream::TokenTree::Token(span, token::Colon)) => match trees.next() {
Some(tokenstream::TokenTree::Token(end_sp, ref tok)) => match tok.ident() {
- Some(kind) => {
+ Some((kind, _)) => {
let span = end_sp.with_lo(start_sp.lo());
result.push(TokenTree::MetaVarDecl(span, ident, kind));
continue;
@@ -289,14 +289,14 @@ where
// `tree` is followed by an `ident`. This could be `$meta_var` or the `$crate` special
// metavariable that names the crate of the invokation.
Some(tokenstream::TokenTree::Token(ident_span, ref token)) if token.is_ident() => {
- let ident = token.ident().unwrap();
+ let (ident, _) = token.ident().unwrap();
let span = ident_span.with_lo(span.lo());
if ident.name == keywords::Crate.name() {
let ident = ast::Ident {
name: keywords::DollarCrate.name(),
..ident
};
- TokenTree::Token(span, token::Ident(ident))
+ TokenTree::Token(span, token::Ident(ident, false))
} else {
TokenTree::MetaVar(span, ident)
}
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 7883c4bbc1648..3f01d5ec6dd87 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -169,7 +169,7 @@ pub fn transcribe(cx: &ExtCtxt,
Ident { ctxt: ident.ctxt.apply_mark(cx.current_expansion.mark), ..ident };
sp = sp.with_ctxt(sp.ctxt().apply_mark(cx.current_expansion.mark));
result.push(TokenTree::Token(sp, token::Dollar).into());
- result.push(TokenTree::Token(sp, token::Ident(ident)).into());
+ result.push(TokenTree::Token(sp, token::Token::from_ast_ident(ident)).into());
}
}
quoted::TokenTree::Delimited(mut span, delimited) => {
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 915396d29fe26..69612054ae3da 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -28,7 +28,7 @@ use self::AttributeGate::*;
use abi::Abi;
use ast::{self, NodeId, PatKind, RangeEnd};
use attr;
-use epoch::Epoch;
+use edition::Edition;
use codemap::Spanned;
use syntax_pos::{Span, DUMMY_SP};
use errors::{DiagnosticBuilder, Handler, FatalError};
@@ -55,13 +55,13 @@ macro_rules! set {
}
macro_rules! declare_features {
- ($((active, $feature: ident, $ver: expr, $issue: expr, $epoch: expr),)+) => {
+ ($((active, $feature: ident, $ver: expr, $issue: expr, $edition: expr),)+) => {
/// Represents active features that are currently being implemented or
/// currently being considered for addition/removal.
const ACTIVE_FEATURES:
&'static [(&'static str, &'static str, Option<u32>,
- Option<Epoch>, fn(&mut Features, Span))] =
- &[$((stringify!($feature), $ver, $issue, $epoch, set!($feature))),+];
+ Option<Edition>, fn(&mut Features, Span))] =
+ &[$((stringify!($feature), $ver, $issue, $edition, set!($feature))),+];
/// A set of features to be used by later passes.
#[derive(Clone)]
@@ -402,7 +402,7 @@ declare_features! (
(active, match_default_bindings, "1.22.0", Some(42640), None),
// Trait object syntax with `dyn` prefix
- (active, dyn_trait, "1.22.0", Some(44662), Some(Epoch::Epoch2018)),
+ (active, dyn_trait, "1.22.0", Some(44662), Some(Edition::Edition2018)),
// `crate` as visibility modifier, synonymous to `pub(crate)`
(active, crate_visibility_modifier, "1.23.0", Some(45388), None),
@@ -451,6 +451,15 @@ declare_features! (
// `use path as _;` and `extern crate c as _;`
(active, underscore_imports, "1.26.0", Some(48216), None),
+
+ // The #[wasm_custom_section] attribute
+ (active, wasm_custom_section, "1.26.0", None, None),
+
+ // The #![wasm_import_module] attribute
+ (active, wasm_import_module, "1.26.0", None, None),
+
+ // Allows keywords to be escaped for use as identifiers
+ (active, raw_identifiers, "1.26.0", Some(48589), None),
);
declare_features! (
@@ -917,6 +926,10 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
"the `#[no_debug]` attribute was an experimental feature that has been \
deprecated due to lack of demand",
cfg_fn!(no_debug))),
+ ("wasm_import_module", Normal, Gated(Stability::Unstable,
+ "wasm_import_module",
+ "experimental attribute",
+ cfg_fn!(wasm_import_module))),
("omit_gdb_pretty_printer_section", Whitelisted, Gated(Stability::Unstable,
"omit_gdb_pretty_printer_section",
"the `#[omit_gdb_pretty_printer_section]` \
@@ -1004,6 +1017,11 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG
"never will be stable",
cfg_fn!(rustc_attrs))),
+ ("wasm_custom_section", Whitelisted, Gated(Stability::Unstable,
+ "wasm_custom_section",
+ "attribute is currently unstable",
+ cfg_fn!(wasm_custom_section))),
+
// Crate level attributes
("crate_name", CrateLevel, Ungated),
("crate_type", CrateLevel, Ungated),
@@ -1800,16 +1818,16 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
}
pub fn get_features(span_handler: &Handler, krate_attrs: &[ast::Attribute],
- epoch: Epoch) -> Features {
+ edition: Edition) -> Features {
let mut features = Features::new();
let mut feature_checker = FeatureChecker::default();
- for &(.., f_epoch, set) in ACTIVE_FEATURES.iter() {
- if let Some(f_epoch) = f_epoch {
- if epoch >= f_epoch {
+ for &(.., f_edition, set) in ACTIVE_FEATURES.iter() {
+ if let Some(f_edition) = f_edition {
+ if edition >= f_edition {
// FIXME(Manishearth) there is currently no way to set
- // lang features by epoch
+ // lang features by edition
set(&mut features, DUMMY_SP);
}
}
@@ -1926,6 +1944,17 @@ pub fn check_crate(krate: &ast::Crate,
parse_sess: sess,
plugin_attributes,
};
+
+ if !features.raw_identifiers {
+ for &span in sess.raw_identifier_spans.borrow().iter() {
+ if !span.allows_unstable() {
+ gate_feature!(&ctx, raw_identifiers, span,
+ "raw identifiers are experimental and subject to change"
+ );
+ }
+ }
+ }
+
let visitor = &mut PostExpansionVisitor { context: &ctx };
visitor.whole_crate_feature_gates(krate);
visit::walk_crate(visitor, krate);
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 46e6027b094bc..05a3150c139c9 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -578,7 +578,7 @@ pub fn noop_fold_tts<T: Folder>(tts: TokenStream, fld: &mut T) -> TokenStream {
// apply ident folder if it's an ident, apply other folds to interpolated nodes
pub fn noop_fold_token<T: Folder>(t: token::Token, fld: &mut T) -> token::Token {
match t {
- token::Ident(id) => token::Ident(fld.fold_ident(id)),
+ token::Ident(id, is_raw) => token::Ident(fld.fold_ident(id), is_raw),
token::Lifetime(id) => token::Lifetime(fld.fold_ident(id)),
token::Interpolated(nt) => {
let nt = match Lrc::try_unwrap(nt) {
@@ -630,7 +630,8 @@ pub fn noop_fold_interpolated<T: Folder>(nt: token::Nonterminal, fld: &mut T)
token::NtPat(pat) => token::NtPat(fld.fold_pat(pat)),
token::NtExpr(expr) => token::NtExpr(fld.fold_expr(expr)),
token::NtTy(ty) => token::NtTy(fld.fold_ty(ty)),
- token::NtIdent(id) => token::NtIdent(Spanned::<Ident>{node: fld.fold_ident(id.node), ..id}),
+ token::NtIdent(id, is_raw) =>
+ token::NtIdent(Spanned::<Ident>{node: fld.fold_ident(id.node), ..id}, is_raw),
token::NtMeta(meta) => token::NtMeta(fld.fold_meta_item(meta)),
token::NtPath(path) => token::NtPath(fld.fold_path(path)),
token::NtTT(tt) => token::NtTT(fld.fold_tt(tt)),
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 5f58b3bc3a050..74f1ee373ec63 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -145,7 +145,7 @@ pub mod codemap;
#[macro_use]
pub mod config;
pub mod entry;
-pub mod epoch;
+pub mod edition;
pub mod feature_gate;
pub mod fold;
pub mod parse;
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs
index 0e20eb49d395e..068929c8948df 100644
--- a/src/libsyntax/parse/lexer/mod.rs
+++ b/src/libsyntax/parse/lexer/mod.rs
@@ -14,7 +14,7 @@ use codemap::{CodeMap, FilePathMapping};
use errors::{FatalError, DiagnosticBuilder};
use parse::{token, ParseSess};
use str::char_at;
-use symbol::Symbol;
+use symbol::{Symbol, keywords};
use std_unicode::property::Pattern_White_Space;
use std::borrow::Cow;
@@ -1115,26 +1115,53 @@ impl<'a> StringReader<'a> {
/// token, and updates the interner
fn next_token_inner(&mut self) -> Result<token::Token, ()> {
let c = self.ch;
- if ident_start(c) &&
- match (c.unwrap(), self.nextch(), self.nextnextch()) {
- // Note: r as in r" or r#" is part of a raw string literal,
- // b as in b' is part of a byte literal.
- // They are not identifiers, and are handled further down.
- ('r', Some('"'), _) |
- ('r', Some('#'), _) |
- ('b', Some('"'), _) |
- ('b', Some('\''), _) |
- ('b', Some('r'), Some('"')) |
- ('b', Some('r'), Some('#')) => false,
- _ => true,
- } {
- let start = self.pos;
- while ident_continue(self.ch) {
- self.bump();
- }
- // FIXME: perform NFKC normalization here. (Issue #2253)
- return Ok(self.with_str_from(start, |string| token::Ident(self.mk_ident(string))));
+ if ident_start(c) {
+ let (is_ident_start, is_raw_ident) =
+ match (c.unwrap(), self.nextch(), self.nextnextch()) {
+ // r# followed by an identifier starter is a raw identifier.
+ // This is an exception to the r# case below.
+ ('r', Some('#'), x) if ident_start(x) => (true, true),
+ // r as in r" or r#" is part of a raw string literal.
+ // b as in b' is part of a byte literal.
+ // They are not identifiers, and are handled further down.
+ ('r', Some('"'), _) |
+ ('r', Some('#'), _) |
+ ('b', Some('"'), _) |
+ ('b', Some('\''), _) |
+ ('b', Some('r'), Some('"')) |
+ ('b', Some('r'), Some('#')) => (false, false),
+ _ => (true, false),
+ };
+ if is_ident_start {
+ let raw_start = self.pos;
+ if is_raw_ident {
+ // Consume the 'r#' characters.
+ self.bump();
+ self.bump();
+ }
+
+ let start = self.pos;
+ while ident_continue(self.ch) {
+ self.bump();
+ }
+
+ return Ok(self.with_str_from(start, |string| {
+ // FIXME: perform NFKC normalization here. (Issue #2253)
+ let ident = self.mk_ident(string);
+ if is_raw_ident && (token::is_path_segment_keyword(ident) ||
+ ident.name == keywords::Underscore.name()) {
+ self.fatal_span_(raw_start, self.pos,
+ &format!("`r#{}` is not currently supported.", ident.name)
+ ).raise();
+ }
+ if is_raw_ident {
+ let span = self.mk_sp(raw_start, self.pos);
+ self.sess.raw_identifier_spans.borrow_mut().push(span);
+ }
+ token::Ident(ident, is_raw_ident)
+ }));
+ }
}
if is_dec_digit(c) {
@@ -1773,6 +1800,7 @@ mod tests {
included_mod_stack: RefCell::new(Vec::new()),
code_map: cm,
missing_fragment_specifiers: RefCell::new(HashSet::new()),
+ raw_identifier_spans: RefCell::new(Vec::new()),
registered_diagnostics: Lock::new(ErrorMap::new()),
non_modrs_mods: RefCell::new(vec![]),
}
@@ -1801,7 +1829,7 @@ mod tests {
assert_eq!(string_reader.next_token().tok, token::Whitespace);
let tok1 = string_reader.next_token();
let tok2 = TokenAndSpan {
- tok: token::Ident(id),
+ tok: token::Ident(id, false),
sp: Span::new(BytePos(21), BytePos(23), NO_EXPANSION),
};
assert_eq!(tok1, tok2);
@@ -1811,7 +1839,7 @@ mod tests {
// read another token:
let tok3 = string_reader.next_token();
let tok4 = TokenAndSpan {
- tok: token::Ident(Ident::from_str("main")),
+ tok: mk_ident("main"),
sp: Span::new(BytePos(24), BytePos(28), NO_EXPANSION),
};
assert_eq!(tok3, tok4);
@@ -1830,7 +1858,7 @@ mod tests {
// make the identifier by looking up the string in the interner
fn mk_ident(id: &str) -> token::Token {
- token::Ident(Ident::from_str(id))
+ token::Token::from_ast_ident(Ident::from_str(id))
}
#[test]
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 202dc03eaa41d..7b39db16ac2c8 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -48,6 +48,9 @@ pub struct ParseSess {
pub unstable_features: UnstableFeatures,
pub config: CrateConfig,
pub missing_fragment_specifiers: RefCell<HashSet<Span>>,
+ /// Places where raw identifiers were used. This is used for feature gating
+ /// raw identifiers
+ pub raw_identifier_spans: RefCell<Vec<Span>>,
/// The registered diagnostics codes
pub registered_diagnostics: Lock<ErrorMap>,
// Spans where a `mod foo;` statement was included in a non-mod.rs file.
@@ -74,6 +77,7 @@ impl ParseSess {
unstable_features: UnstableFeatures::from_environment(),
config: HashSet::new(),
missing_fragment_specifiers: RefCell::new(HashSet::new()),
+ raw_identifier_spans: RefCell::new(Vec::new()),
registered_diagnostics: Lock::new(ErrorMap::new()),
included_mod_stack: RefCell::new(vec![]),
code_map,
@@ -739,9 +743,9 @@ mod tests {
match (tts.len(), tts.get(0), tts.get(1), tts.get(2), tts.get(3)) {
(
4,
- Some(&TokenTree::Token(_, token::Ident(name_macro_rules))),
+ Some(&TokenTree::Token(_, token::Ident(name_macro_rules, false))),
Some(&TokenTree::Token(_, token::Not)),
- Some(&TokenTree::Token(_, token::Ident(name_zip))),
+ Some(&TokenTree::Token(_, token::Ident(name_zip, false))),
Some(&TokenTree::Delimited(_, ref macro_delimed)),
)
if name_macro_rules.name == "macro_rules"
@@ -760,7 +764,7 @@ mod tests {
(
2,
Some(&TokenTree::Token(_, token::Dollar)),
- Some(&TokenTree::Token(_, token::Ident(ident))),
+ Some(&TokenTree::Token(_, token::Ident(ident, false))),
)
if first_delimed.delim == token::Paren && ident.name == "a" => {},
_ => panic!("value 3: {:?}", *first_delimed),
@@ -770,7 +774,7 @@ mod tests {
(
2,
Some(&TokenTree::Token(_, token::Dollar)),
- Some(&TokenTree::Token(_, token::Ident(ident))),
+ Some(&TokenTree::Token(_, token::Ident(ident, false))),
)
if second_delimed.delim == token::Paren
&& ident.name == "a" => {},
@@ -791,17 +795,18 @@ mod tests {
let tts = string_to_stream("fn a (b : i32) { b; }".to_string());
let expected = TokenStream::concat(vec![
- TokenTree::Token(sp(0, 2), token::Ident(Ident::from_str("fn"))).into(),
- TokenTree::Token(sp(3, 4), token::Ident(Ident::from_str("a"))).into(),
+ TokenTree::Token(sp(0, 2), token::Ident(Ident::from_str("fn"), false)).into(),
+ TokenTree::Token(sp(3, 4), token::Ident(Ident::from_str("a"), false)).into(),
TokenTree::Delimited(
sp(5, 14),
tokenstream::Delimited {
delim: token::DelimToken::Paren,
tts: TokenStream::concat(vec![
- TokenTree::Token(sp(6, 7), token::Ident(Ident::from_str("b"))).into(),
+ TokenTree::Token(sp(6, 7),
+ token::Ident(Ident::from_str("b"), false)).into(),
TokenTree::Token(sp(8, 9), token::Colon).into(),
TokenTree::Token(sp(10, 13),
- token::Ident(Ident::from_str("i32"))).into(),
+ token::Ident(Ident::from_str("i32"), false)).into(),
]).into(),
}).into(),
TokenTree::Delimited(
@@ -809,7 +814,8 @@ mod tests {
tokenstream::Delimited {
delim: token::DelimToken::Brace,
tts: TokenStream::concat(vec![
- TokenTree::Token(sp(17, 18), token::Ident(Ident::from_str("b"))).into(),
+ TokenTree::Token(sp(17, 18),
+ token::Ident(Ident::from_str("b"), false)).into(),
TokenTree::Token(sp(18, 19), token::Semi).into(),
]).into(),
}).into()
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 6d8975197d55c..a07279acae2d3 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -358,7 +358,7 @@ impl TokenCursor {
let body = TokenTree::Delimited(sp, Delimited {
delim: token::Bracket,
- tts: [TokenTree::Token(sp, token::Ident(ast::Ident::from_str("doc"))),
+ tts: [TokenTree::Token(sp, token::Ident(ast::Ident::from_str("doc"), false)),
TokenTree::Token(sp, token::Eq),
TokenTree::Token(sp, token::Literal(
token::StrRaw(Symbol::intern(&stripped), num_of_hashes), None))]
@@ -784,7 +784,7 @@ impl<'a> Parser<'a> {
fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {
match self.token {
- token::Ident(i) => {
+ token::Ident(i, _) => {
if self.token.is_reserved_ident() {
let mut err = self.expected_ident_found();
if recover {
@@ -1925,7 +1925,7 @@ impl<'a> Parser<'a> {
pub fn parse_path_segment_ident(&mut self) -> PResult<'a, ast::Ident> {
match self.token {
- token::Ident(sid) if self.token.is_path_segment_keyword() => {
+ token::Ident(sid, _) if self.token.is_path_segment_keyword() => {
self.bump();
Ok(sid)
}
@@ -2740,11 +2740,14 @@ impl<'a> Parser<'a> {
}
pub fn process_potential_macro_variable(&mut self) {
- let ident = match self.token {
+ let (ident, is_raw) = match self.token {
token::Dollar if self.span.ctxt() != syntax_pos::hygiene::SyntaxContext::empty() &&
self.look_ahead(1, |t| t.is_ident()) => {
self.bump();
- let name = match self.token { token::Ident(ident) => ident, _ => unreachable!() };
+ let name = match self.token {
+ token::Ident(ident, _) => ident,
+ _ => unreachable!()
+ };
let mut err = self.fatal(&format!("unknown macro variable `{}`", name));
err.span_label(self.span, "unknown macro variable");
err.emit();
@@ -2753,13 +2756,13 @@ impl<'a> Parser<'a> {
token::Interpolated(ref nt) => {
self.meta_var_span = Some(self.span);
match nt.0 {
- token::NtIdent(ident) => ident,
+ token::NtIdent(ident, is_raw) => (ident, is_raw),
_ => return,
}
}
_ => return,
};
- self.token = token::Ident(ident.node);
+ self.token = token::Ident(ident.node, is_raw);
self.span = ident.span;
}
@@ -4245,7 +4248,7 @@ impl<'a> Parser<'a> {
-> PResult<'a, Option<P<Item>>> {
let token_lo = self.span;
let (ident, def) = match self.token {
- token::Ident(ident) if ident.name == keywords::Macro.name() => {
+ token::Ident(ident, false) if ident.name == keywords::Macro.name() => {
self.bump();
let ident = self.parse_ident()?;
let tokens = if self.check(&token::OpenDelim(token::Brace)) {
@@ -4273,7 +4276,7 @@ impl<'a> Parser<'a> {
(ident, ast::MacroDef { tokens: tokens.into(), legacy: false })
}
- token::Ident(ident) if ident.name == "macro_rules" &&
+ token::Ident(ident, _) if ident.name == "macro_rules" &&
self.look_ahead(1, |t| *t == token::Not) => {
let prev_span = self.prev_span;
self.complain_if_pub_macro(&vis.node, prev_span);
@@ -5078,7 +5081,9 @@ impl<'a> Parser<'a> {
fn parse_self_arg(&mut self) -> PResult<'a, Option<Arg>> {
let expect_ident = |this: &mut Self| match this.token {
// Preserve hygienic context.
- token::Ident(ident) => { let sp = this.span; this.bump(); codemap::respan(sp, ident) }
+ token::Ident(ident, _) => {
+ let sp = this.span; this.bump(); codemap::respan(sp, ident)
+ }
_ => unreachable!()
};
let isolated_self = |this: &mut Self, n| {
@@ -5375,7 +5380,7 @@ impl<'a> Parser<'a> {
VisibilityKind::Inherited => Ok(()),
_ => {
let is_macro_rules: bool = match self.token {
- token::Ident(sid) => sid.name == Symbol::intern("macro_rules"),
+ token::Ident(sid, _) => sid.name == Symbol::intern("macro_rules"),
_ => false,
};
if is_macro_rules {
@@ -7016,7 +7021,7 @@ impl<'a> Parser<'a> {
fn parse_rename(&mut self) -> PResult<'a, Option<Ident>> {
if self.eat_keyword(keywords::As) {
match self.token {
- token::Ident(ident) if ident.name == keywords::Underscore.name() => {
+ token::Ident(ident, false) if ident.name == keywords::Underscore.name() => {
self.bump(); // `_`
Ok(Some(Ident { name: ident.name.gensymed(), ..ident }))
}
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 4ada9e20f2cc0..7798a7a77ee6c 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -91,8 +91,8 @@ impl Lit {
}
}
-fn ident_can_begin_expr(ident: ast::Ident) -> bool {
- let ident_token: Token = Ident(ident);
+fn ident_can_begin_expr(ident: ast::Ident, is_raw: bool) -> bool {
+ let ident_token: Token = Ident(ident, is_raw);
!ident_token.is_reserved_ident() ||
ident_token.is_path_segment_keyword() ||
@@ -116,8 +116,8 @@ fn ident_can_begin_expr(ident: ast::Ident) -> bool {
].contains(&ident.name)
}
-fn ident_can_begin_type(ident: ast::Ident) -> bool {
- let ident_token: Token = Ident(ident);
+fn ident_can_begin_type(ident: ast::Ident, is_raw: bool) -> bool {
+ let ident_token: Token = Ident(ident, is_raw);
!ident_token.is_reserved_ident() ||
ident_token.is_path_segment_keyword() ||
@@ -132,6 +132,37 @@ fn ident_can_begin_type(ident: ast::Ident) -> bool {
].contains(&ident.name)
}
+pub fn is_path_segment_keyword(id: ast::Ident) -> bool {
+ id.name == keywords::Super.name() ||
+ id.name == keywords::SelfValue.name() ||
+ id.name == keywords::SelfType.name() ||
+ id.name == keywords::Extern.name() ||
+ id.name == keywords::Crate.name() ||
+ id.name == keywords::CrateRoot.name() ||
+ id.name == keywords::DollarCrate.name()
+}
+
+// Returns true for reserved identifiers used internally for elided lifetimes,
+// unnamed method parameters, crate root module, error recovery etc.
+pub fn is_special_ident(id: ast::Ident) -> bool {
+ id.name <= keywords::Underscore.name()
+}
+
+/// Returns `true` if the token is a keyword used in the language.
+pub fn is_used_keyword(id: ast::Ident) -> bool {
+ id.name >= keywords::As.name() && id.name <= keywords::While.name()
+}
+
+/// Returns `true` if the token is a keyword reserved for possible future use.
+pub fn is_unused_keyword(id: ast::Ident) -> bool {
+ id.name >= keywords::Abstract.name() && id.name <= keywords::Yield.name()
+}
+
+/// Returns `true` if the token is either a special identifier or a keyword.
+pub fn is_reserved_ident(id: ast::Ident) -> bool {
+ is_special_ident(id) || is_used_keyword(id) || is_unused_keyword(id)
+}
+
#[derive(Clone, RustcEncodable, RustcDecodable, PartialEq, Eq, Hash, Debug)]
pub enum Token {
/* Expression-operator symbols. */
@@ -175,7 +206,7 @@ pub enum Token {
Literal(Lit, Option<ast::Name>),
/* Name components */
- Ident(ast::Ident),
+ Ident(ast::Ident, /* is_raw */ bool),
Lifetime(ast::Ident),
// The `LazyTokenStream` is a pure function of the `Nonterminal`,
@@ -203,6 +234,11 @@ impl Token {
Token::Interpolated(Lrc::new((nt, LazyTokenStream::new())))
}
+ /// Recovers a `Token` from an `ast::Ident`. This creates a raw identifier if necessary.
+ pub fn from_ast_ident(ident: ast::Ident) -> Token {
+ Ident(ident, is_reserved_ident(ident) && !is_path_segment_keyword(ident))
+ }
+
/// Returns `true` if the token starts with '>'.
pub fn is_like_gt(&self) -> bool {
match *self {
@@ -214,7 +250,8 @@ impl Token {
/// Returns `true` if the token can appear at the start of an expression.
pub fn can_begin_expr(&self) -> bool {
match *self {
- Ident(ident) => ident_can_begin_expr(ident), // value name or keyword
+ Ident(ident, is_raw) =>
+ ident_can_begin_expr(ident, is_raw), // value name or keyword
OpenDelim(..) | // tuple, array or block
Literal(..) | // literal
Not | // operator not
@@ -239,7 +276,8 @@ impl Token {
/// Returns `true` if the token can appear at the start of a type.
pub fn can_begin_type(&self) -> bool {
match *self {
- Ident(ident) => ident_can_begin_type(ident), // type name or keyword
+ Ident(ident, is_raw) =>
+ ident_can_begin_type(ident, is_raw), // type name or keyword
OpenDelim(Paren) | // tuple
OpenDelim(Bracket) | // array
Not | // never
@@ -272,11 +310,11 @@ impl Token {
}
}
- pub fn ident(&self) -> Option<ast::Ident> {
+ pub fn ident(&self) -> Option<(ast::Ident, bool)> {
match *self {
- Ident(ident) => Some(ident),
+ Ident(ident, is_raw) => Some((ident, is_raw)),
Interpolated(ref nt) => match nt.0 {
- NtIdent(ident) => Some(ident.node),
+ NtIdent(ident, is_raw) => Some((ident.node, is_raw)),
_ => None,
},
_ => None,
@@ -351,19 +389,13 @@ impl Token {
/// Returns `true` if the token is a given keyword, `kw`.
pub fn is_keyword(&self, kw: keywords::Keyword) -> bool {
- self.ident().map(|ident| ident.name == kw.name()).unwrap_or(false)
+ self.ident().map(|(ident, is_raw)| ident.name == kw.name() && !is_raw).unwrap_or(false)
}
pub fn is_path_segment_keyword(&self) -> bool {
match self.ident() {
- Some(id) => id.name == keywords::Super.name() ||
- id.name == keywords::SelfValue.name() ||
- id.name == keywords::SelfType.name() ||
- id.name == keywords::Extern.name() ||
- id.name == keywords::Crate.name() ||
- id.name == keywords::CrateRoot.name() ||
- id.name == keywords::DollarCrate.name(),
- None => false,
+ Some((id, false)) => is_path_segment_keyword(id),
+ _ => false,
}
}
@@ -371,7 +403,7 @@ impl Token {
// unnamed method parameters, crate root module, error recovery etc.
pub fn is_special_ident(&self) -> bool {
match self.ident() {
- Some(id) => id.name <= keywords::Underscore.name(),
+ Some((id, false)) => is_special_ident(id),
_ => false,
}
}
@@ -379,7 +411,7 @@ impl Token {
/// Returns `true` if the token is a keyword used in the language.
pub fn is_used_keyword(&self) -> bool {
match self.ident() {
- Some(id) => id.name >= keywords::As.name() && id.name <= keywords::While.name(),
+ Some((id, false)) => is_used_keyword(id),
_ => false,
}
}
@@ -387,7 +419,7 @@ impl Token {
/// Returns `true` if the token is a keyword reserved for possible future use.
pub fn is_unused_keyword(&self) -> bool {
match self.ident() {
- Some(id) => id.name >= keywords::Abstract.name() && id.name <= keywords::Yield.name(),
+ Some((id, false)) => is_unused_keyword(id),
_ => false,
}
}
@@ -460,7 +492,10 @@ impl Token {
/// Returns `true` if the token is either a special identifier or a keyword.
pub fn is_reserved_ident(&self) -> bool {
- self.is_special_ident() || self.is_used_keyword() || self.is_unused_keyword()
+ match self.ident() {
+ Some((id, false)) => is_reserved_ident(id),
+ _ => false,
+ }
}
pub fn interpolated_to_tokenstream(&self, sess: &ParseSess, span: Span)
@@ -496,8 +531,8 @@ impl Token {
Nonterminal::NtImplItem(ref item) => {
tokens = prepend_attrs(sess, &item.attrs, item.tokens.as_ref(), span);
}
- Nonterminal::NtIdent(ident) => {
- let token = Token::Ident(ident.node);
+ Nonterminal::NtIdent(ident, is_raw) => {
+ let token = Token::Ident(ident.node, is_raw);
tokens = Some(TokenTree::Token(ident.span, token).into());
}
Nonterminal::NtLifetime(lifetime) => {
@@ -529,7 +564,7 @@ pub enum Nonterminal {
NtPat(P<ast::Pat>),
NtExpr(P<ast::Expr>),
NtTy(P<ast::Ty>),
- NtIdent(ast::SpannedIdent),
+ NtIdent(ast::SpannedIdent, /* is_raw */ bool),
/// Stuff inside brackets for attributes
NtMeta(ast::MetaItem),
NtPath(ast::Path),
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 7adb2848f8d94..50577a26abf41 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -250,7 +250,8 @@ pub fn token_to_string(tok: &Token) -> String {
}
/* Name components */
- token::Ident(s) => s.to_string(),
+ token::Ident(s, false) => s.to_string(),
+ token::Ident(s, true) => format!("r#{}", s),
token::Lifetime(s) => s.to_string(),
/* Other */
@@ -261,24 +262,25 @@ pub fn token_to_string(tok: &Token) -> String {
token::Shebang(s) => format!("/* shebang: {}*/", s),
token::Interpolated(ref nt) => match nt.0 {
- token::NtExpr(ref e) => expr_to_string(e),
- token::NtMeta(ref e) => meta_item_to_string(e),
- token::NtTy(ref e) => ty_to_string(e),
- token::NtPath(ref e) => path_to_string(e),
- token::NtItem(ref e) => item_to_string(e),
- token::NtBlock(ref e) => block_to_string(e),
- token::NtStmt(ref e) => stmt_to_string(e),
- token::NtPat(ref e) => pat_to_string(e),
- token::NtIdent(ref e) => ident_to_string(e.node),
- token::NtTT(ref tree) => tt_to_string(tree.clone()),
- token::NtArm(ref e) => arm_to_string(e),
- token::NtImplItem(ref e) => impl_item_to_string(e),
- token::NtTraitItem(ref e) => trait_item_to_string(e),
- token::NtGenerics(ref e) => generic_params_to_string(&e.params),
- token::NtWhereClause(ref e) => where_clause_to_string(e),
- token::NtArg(ref e) => arg_to_string(e),
- token::NtVis(ref e) => vis_to_string(e),
- token::NtLifetime(ref e) => lifetime_to_string(e),
+ token::NtExpr(ref e) => expr_to_string(e),
+ token::NtMeta(ref e) => meta_item_to_string(e),
+ token::NtTy(ref e) => ty_to_string(e),
+ token::NtPath(ref e) => path_to_string(e),
+ token::NtItem(ref e) => item_to_string(e),
+ token::NtBlock(ref e) => block_to_string(e),
+ token::NtStmt(ref e) => stmt_to_string(e),
+ token::NtPat(ref e) => pat_to_string(e),
+ token::NtIdent(ref e, false) => ident_to_string(e.node),
+ token::NtIdent(ref e, true) => format!("r#{}", ident_to_string(e.node)),
+ token::NtTT(ref tree) => tt_to_string(tree.clone()),
+ token::NtArm(ref e) => arm_to_string(e),
+ token::NtImplItem(ref e) => impl_item_to_string(e),
+ token::NtTraitItem(ref e) => trait_item_to_string(e),
+ token::NtGenerics(ref e) => generic_params_to_string(&e.params),
+ token::NtWhereClause(ref e) => where_clause_to_string(e),
+ token::NtArg(ref e) => arg_to_string(e),
+ token::NtVis(ref e) => vis_to_string(e),
+ token::NtLifetime(ref e) => lifetime_to_string(e),
}
}
}
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs
index 1219e909e121a..3a7a1b9a66966 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/libsyntax/tokenstream.rs
@@ -684,7 +684,7 @@ mod tests {
with_globals(|| {
let test0: TokenStream = Vec::<TokenTree>::new().into_iter().collect();
let test1: TokenStream =
- TokenTree::Token(sp(0, 1), Token::Ident(Ident::from_str("a"))).into();
+ TokenTree::Token(sp(0, 1), Token::Ident(Ident::from_str("a"), false)).into();
let test2 = string_to_ts("foo(bar::baz)");
assert_eq!(test0.is_empty(), true);
diff --git a/src/libsyntax_ext/concat_idents.rs b/src/libsyntax_ext/concat_idents.rs
index 8d0104e512bfb..d513008f0e2d3 100644
--- a/src/libsyntax_ext/concat_idents.rs
+++ b/src/libsyntax_ext/concat_idents.rs
@@ -44,7 +44,8 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt,
}
} else {
match *e {
- TokenTree::Token(_, token::Ident(ident)) => res_str.push_str(&ident.name.as_str()),
+ TokenTree::Token(_, token::Ident(ident, _)) =>
+ res_str.push_str(&ident.name.as_str()),
_ => {
cx.span_err(sp, "concat_idents! requires ident args.");
return DummyResult::expr(sp);
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs
index 8fd95aa1ca861..d9c68e3167bd6 100644
--- a/src/libsyntax_ext/format.rs
+++ b/src/libsyntax_ext/format.rs
@@ -149,7 +149,7 @@ fn parse_args(ecx: &mut ExtCtxt,
if named || (p.token.is_ident() && p.look_ahead(1, |t| *t == token::Eq)) {
named = true;
let ident = match p.token {
- token::Ident(i) => {
+ token::Ident(i, _) => {
p.bump();
i
}
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs
index 9b83d5510fb7d..5a7b7e9ceca5c 100644
--- a/src/libsyntax_pos/lib.rs
+++ b/src/libsyntax_pos/lib.rs
@@ -184,8 +184,12 @@ impl SpanData {
}
}
-// The interner in thread-local, so `Span` shouldn't move between threads.
+// The interner is pointed to by a thread local value which is only set on the main thread
+// with parallelization is disabled. So we don't allow Span to transfer between threads
+// to avoid panics and other errors, even though it would be memory safe to do so.
+#[cfg(not(parallel_queries))]
impl !Send for Span {}
+#[cfg(not(parallel_queries))]
impl !Sync for Span {}
impl PartialOrd for Span {
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 0cba094da641d..098eafef2585c 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -83,8 +83,12 @@ impl Decodable for Ident {
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct Symbol(u32);
-// The interner in thread-local, so `Symbol` shouldn't move between threads.
+// The interner is pointed to by a thread local value which is only set on the main thread
+// with parallelization is disabled. So we don't allow Symbol to transfer between threads
+// to avoid panics and other errors, even though it would be memory safe to do so.
+#[cfg(not(parallel_queries))]
impl !Send for Symbol { }
+#[cfg(not(parallel_queries))]
impl !Sync for Symbol { }
impl Symbol {
diff --git a/src/test/COMPILER_TESTS.md b/src/test/COMPILER_TESTS.md
index c255294e790b7..8553665c01797 100644
--- a/src/test/COMPILER_TESTS.md
+++ b/src/test/COMPILER_TESTS.md
@@ -54,6 +54,8 @@ be compiled or run.
* `ignore-test` always ignores the test
* `ignore-lldb` and `ignore-gdb` will skip a debuginfo test on that debugger.
+`only-X` is the opposite. The test will run only when `X` matches.
+
Some examples of `X` in `ignore-X`:
* Architecture: `aarch64`, `arm`, `asmjs`, `mips`, `wasm32`, `x86_64`, `x86`, ...
diff --git a/src/test/compile-fail/epoch-raw-pointer-method-2015.rs b/src/test/compile-fail/edition-raw-pointer-method-2015.rs
similarity index 85%
rename from src/test/compile-fail/epoch-raw-pointer-method-2015.rs
rename to src/test/compile-fail/edition-raw-pointer-method-2015.rs
index 6aa83a38b7ee9..fdc9b4f704cd1 100644
--- a/src/test/compile-fail/epoch-raw-pointer-method-2015.rs
+++ b/src/test/compile-fail/edition-raw-pointer-method-2015.rs
@@ -9,9 +9,9 @@
// except according to those terms.
// ignore-tidy-linelength
-// compile-flags: -Zepoch=2015 -Zunstable-options
+// compile-flags: -Zedition=2015 -Zunstable-options
-// tests that epochs work with the tyvar warning-turned-error
+// tests that editions work with the tyvar warning-turned-error
#[deny(warnings)]
fn main() {
diff --git a/src/test/compile-fail/epoch-raw-pointer-method-2018.rs b/src/test/compile-fail/edition-raw-pointer-method-2018.rs
similarity index 85%
rename from src/test/compile-fail/epoch-raw-pointer-method-2018.rs
rename to src/test/compile-fail/edition-raw-pointer-method-2018.rs
index c4815de2306e9..58b34591029ba 100644
--- a/src/test/compile-fail/epoch-raw-pointer-method-2018.rs
+++ b/src/test/compile-fail/edition-raw-pointer-method-2018.rs
@@ -9,9 +9,9 @@
// except according to those terms.
// ignore-tidy-linelength
-// compile-flags: -Zepoch=2018 -Zunstable-options
+// compile-flags: -Zedition=2018 -Zunstable-options
-// tests that epochs work with the tyvar warning-turned-error
+// tests that editions work with the tyvar warning-turned-error
#[deny(warnings)]
fn main() {
diff --git a/src/test/compile-fail/issue-17994.rs b/src/test/compile-fail/issue-17994.rs
index 0f30e2461cf3b..25141b9b82557 100644
--- a/src/test/compile-fail/issue-17994.rs
+++ b/src/test/compile-fail/issue-17994.rs
@@ -10,5 +10,4 @@
trait Tr {}
type Huh<T> where T: Tr = isize; //~ ERROR type parameter `T` is unused
- //~| WARNING where clauses are ignored in type aliases
fn main() {}
diff --git a/src/test/compile-fail/private-in-public-warn.rs b/src/test/compile-fail/private-in-public-warn.rs
index cc9eed7e65426..6eeb14638e759 100644
--- a/src/test/compile-fail/private-in-public-warn.rs
+++ b/src/test/compile-fail/private-in-public-warn.rs
@@ -58,7 +58,6 @@ mod traits {
pub trait PubTr {}
pub type Alias<T: PrivTr> = T; //~ ERROR private trait `traits::PrivTr` in public interface
- //~^ WARNING bounds on generic parameters are ignored
//~| WARNING hard error
pub trait Tr1: PrivTr {} //~ ERROR private trait `traits::PrivTr` in public interface
//~^ WARNING hard error
@@ -85,7 +84,6 @@ mod traits_where {
pub type Alias<T> where T: PrivTr = T;
//~^ ERROR private trait `traits_where::PrivTr` in public interface
//~| WARNING hard error
- //~| WARNING where clauses are ignored in type aliases
pub trait Tr2<T> where T: PrivTr {}
//~^ ERROR private trait `traits_where::PrivTr` in public interface
//~| WARNING hard error
diff --git a/src/test/compile-fail/struct-pat-derived-error.rs b/src/test/compile-fail/struct-pat-derived-error.rs
index f525ec373753d..d3130c4e831f6 100644
--- a/src/test/compile-fail/struct-pat-derived-error.rs
+++ b/src/test/compile-fail/struct-pat-derived-error.rs
@@ -16,10 +16,8 @@ struct a {
impl a {
fn foo(&self) {
let a { x, y } = self.d; //~ ERROR no field `d` on type `&a`
- //~^ ERROR struct `a` does not have a field named `x`
- //~^^ ERROR struct `a` does not have a field named `y`
- //~^^^ ERROR pattern does not mention field `b`
- //~^^^^ ERROR pattern does not mention field `c`
+ //~^ ERROR struct `a` does not have fields named `x`, `y`
+ //~| ERROR pattern does not mention fields `b`, `c`
}
}
diff --git a/src/test/parse-fail/raw-str-delim.rs b/src/test/parse-fail/raw-str-delim.rs
index 3fc5f8aae1876..8c0027287dece 100644
--- a/src/test/parse-fail/raw-str-delim.rs
+++ b/src/test/parse-fail/raw-str-delim.rs
@@ -11,5 +11,5 @@
// compile-flags: -Z parse-only
static s: &'static str =
- r#x"#"x# //~ ERROR found invalid character; only `#` is allowed in raw string delimitation
+ r#~"#"~# //~ ERROR found invalid character; only `#` is allowed in raw string delimitation
;
diff --git a/src/test/run-make/a-b-a-linker-guard/Makefile b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
similarity index 100%
rename from src/test/run-make/a-b-a-linker-guard/Makefile
rename to src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile
diff --git a/src/test/run-make/a-b-a-linker-guard/a.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
similarity index 100%
rename from src/test/run-make/a-b-a-linker-guard/a.rs
rename to src/test/run-make-fulldeps/a-b-a-linker-guard/a.rs
diff --git a/src/test/run-make/a-b-a-linker-guard/b.rs b/src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
similarity index 100%
rename from src/test/run-make/a-b-a-linker-guard/b.rs
rename to src/test/run-make-fulldeps/a-b-a-linker-guard/b.rs
diff --git a/src/test/run-make/alloc-extern-crates/Makefile b/src/test/run-make-fulldeps/alloc-extern-crates/Makefile
similarity index 100%
rename from src/test/run-make/alloc-extern-crates/Makefile
rename to src/test/run-make-fulldeps/alloc-extern-crates/Makefile
diff --git a/src/test/run-make/alloc-extern-crates/fakealloc.rs b/src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
similarity index 100%
rename from src/test/run-make/alloc-extern-crates/fakealloc.rs
rename to src/test/run-make-fulldeps/alloc-extern-crates/fakealloc.rs
diff --git a/src/test/run-make/allow-non-lint-warnings-cmdline/Makefile b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
similarity index 100%
rename from src/test/run-make/allow-non-lint-warnings-cmdline/Makefile
rename to src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
diff --git a/src/test/run-make/allow-non-lint-warnings-cmdline/foo.rs b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
similarity index 100%
rename from src/test/run-make/allow-non-lint-warnings-cmdline/foo.rs
rename to src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/Makefile b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
similarity index 100%
rename from src/test/run-make/allow-warnings-cmdline-stability/Makefile
rename to src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/bar.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
similarity index 100%
rename from src/test/run-make/allow-warnings-cmdline-stability/bar.rs
rename to src/test/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
diff --git a/src/test/run-make/allow-warnings-cmdline-stability/foo.rs b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
similarity index 100%
rename from src/test/run-make/allow-warnings-cmdline-stability/foo.rs
rename to src/test/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
diff --git a/src/test/run-make/archive-duplicate-names/Makefile b/src/test/run-make-fulldeps/archive-duplicate-names/Makefile
similarity index 100%
rename from src/test/run-make/archive-duplicate-names/Makefile
rename to src/test/run-make-fulldeps/archive-duplicate-names/Makefile
diff --git a/src/test/run-make/archive-duplicate-names/bar.c b/src/test/run-make-fulldeps/archive-duplicate-names/bar.c
similarity index 100%
rename from src/test/run-make/archive-duplicate-names/bar.c
rename to src/test/run-make-fulldeps/archive-duplicate-names/bar.c
diff --git a/src/test/run-make/archive-duplicate-names/bar.rs b/src/test/run-make-fulldeps/archive-duplicate-names/bar.rs
similarity index 100%
rename from src/test/run-make/archive-duplicate-names/bar.rs
rename to src/test/run-make-fulldeps/archive-duplicate-names/bar.rs
diff --git a/src/test/run-make/archive-duplicate-names/foo.c b/src/test/run-make-fulldeps/archive-duplicate-names/foo.c
similarity index 100%
rename from src/test/run-make/archive-duplicate-names/foo.c
rename to src/test/run-make-fulldeps/archive-duplicate-names/foo.c
diff --git a/src/test/run-make/archive-duplicate-names/foo.rs b/src/test/run-make-fulldeps/archive-duplicate-names/foo.rs
similarity index 100%
rename from src/test/run-make/archive-duplicate-names/foo.rs
rename to src/test/run-make-fulldeps/archive-duplicate-names/foo.rs
diff --git a/src/test/run-make/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile
similarity index 100%
rename from src/test/run-make/atomic-lock-free/Makefile
rename to src/test/run-make-fulldeps/atomic-lock-free/Makefile
diff --git a/src/test/run-make/atomic-lock-free/atomic_lock_free.rs b/src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
similarity index 100%
rename from src/test/run-make/atomic-lock-free/atomic_lock_free.rs
rename to src/test/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
diff --git a/src/test/run-make/bare-outfile/Makefile b/src/test/run-make-fulldeps/bare-outfile/Makefile
similarity index 100%
rename from src/test/run-make/bare-outfile/Makefile
rename to src/test/run-make-fulldeps/bare-outfile/Makefile
diff --git a/src/test/run-make/bare-outfile/foo.rs b/src/test/run-make-fulldeps/bare-outfile/foo.rs
similarity index 100%
rename from src/test/run-make/bare-outfile/foo.rs
rename to src/test/run-make-fulldeps/bare-outfile/foo.rs
diff --git a/src/test/run-make/c-dynamic-dylib/Makefile b/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile
similarity index 100%
rename from src/test/run-make/c-dynamic-dylib/Makefile
rename to src/test/run-make-fulldeps/c-dynamic-dylib/Makefile
diff --git a/src/test/run-make/c-dynamic-dylib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs
similarity index 100%
rename from src/test/run-make/c-dynamic-dylib/bar.rs
rename to src/test/run-make-fulldeps/c-dynamic-dylib/bar.rs
diff --git a/src/test/run-make/c-dynamic-dylib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
similarity index 100%
rename from src/test/run-make/c-dynamic-dylib/cfoo.c
rename to src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
diff --git a/src/test/run-make/c-dynamic-dylib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs
similarity index 100%
rename from src/test/run-make/c-dynamic-dylib/foo.rs
rename to src/test/run-make-fulldeps/c-dynamic-dylib/foo.rs
diff --git a/src/test/run-make/c-dynamic-rlib/Makefile b/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile
similarity index 100%
rename from src/test/run-make/c-dynamic-rlib/Makefile
rename to src/test/run-make-fulldeps/c-dynamic-rlib/Makefile
diff --git a/src/test/run-make/c-dynamic-rlib/bar.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs
similarity index 100%
rename from src/test/run-make/c-dynamic-rlib/bar.rs
rename to src/test/run-make-fulldeps/c-dynamic-rlib/bar.rs
diff --git a/src/test/run-make/c-dynamic-rlib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
similarity index 100%
rename from src/test/run-make/c-dynamic-rlib/cfoo.c
rename to src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
diff --git a/src/test/run-make/c-dynamic-rlib/foo.rs b/src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs
similarity index 100%
rename from src/test/run-make/c-dynamic-rlib/foo.rs
rename to src/test/run-make-fulldeps/c-dynamic-rlib/foo.rs
diff --git a/src/test/run-make/c-link-to-rust-dylib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile
similarity index 100%
rename from src/test/run-make/c-link-to-rust-dylib/Makefile
rename to src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile
diff --git a/src/test/run-make/c-link-to-rust-dylib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
similarity index 100%
rename from src/test/run-make/c-link-to-rust-dylib/bar.c
rename to src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
diff --git a/src/test/run-make/c-link-to-rust-dylib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
similarity index 100%
rename from src/test/run-make/c-link-to-rust-dylib/foo.rs
rename to src/test/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
diff --git a/src/test/run-make/c-link-to-rust-staticlib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
similarity index 100%
rename from src/test/run-make/c-link-to-rust-staticlib/Makefile
rename to src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
diff --git a/src/test/run-make/c-link-to-rust-staticlib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
similarity index 100%
rename from src/test/run-make/c-link-to-rust-staticlib/bar.c
rename to src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
diff --git a/src/test/run-make/c-link-to-rust-staticlib/foo.rs b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
similarity index 100%
rename from src/test/run-make/c-link-to-rust-staticlib/foo.rs
rename to src/test/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
diff --git a/src/test/run-make/c-static-dylib/Makefile b/src/test/run-make-fulldeps/c-static-dylib/Makefile
similarity index 100%
rename from src/test/run-make/c-static-dylib/Makefile
rename to src/test/run-make-fulldeps/c-static-dylib/Makefile
diff --git a/src/test/run-make/c-static-dylib/bar.rs b/src/test/run-make-fulldeps/c-static-dylib/bar.rs
similarity index 100%
rename from src/test/run-make/c-static-dylib/bar.rs
rename to src/test/run-make-fulldeps/c-static-dylib/bar.rs
diff --git a/src/test/run-make/c-static-dylib/cfoo.c b/src/test/run-make-fulldeps/c-static-dylib/cfoo.c
similarity index 100%
rename from src/test/run-make/c-static-dylib/cfoo.c
rename to src/test/run-make-fulldeps/c-static-dylib/cfoo.c
diff --git a/src/test/run-make/c-static-dylib/foo.rs b/src/test/run-make-fulldeps/c-static-dylib/foo.rs
similarity index 100%
rename from src/test/run-make/c-static-dylib/foo.rs
rename to src/test/run-make-fulldeps/c-static-dylib/foo.rs
diff --git a/src/test/run-make/c-static-rlib/Makefile b/src/test/run-make-fulldeps/c-static-rlib/Makefile
similarity index 100%
rename from src/test/run-make/c-static-rlib/Makefile
rename to src/test/run-make-fulldeps/c-static-rlib/Makefile
diff --git a/src/test/run-make/c-static-rlib/bar.rs b/src/test/run-make-fulldeps/c-static-rlib/bar.rs
similarity index 100%
rename from src/test/run-make/c-static-rlib/bar.rs
rename to src/test/run-make-fulldeps/c-static-rlib/bar.rs
diff --git a/src/test/run-make/c-static-rlib/cfoo.c b/src/test/run-make-fulldeps/c-static-rlib/cfoo.c
similarity index 100%
rename from src/test/run-make/c-static-rlib/cfoo.c
rename to src/test/run-make-fulldeps/c-static-rlib/cfoo.c
diff --git a/src/test/run-make/c-static-rlib/foo.rs b/src/test/run-make-fulldeps/c-static-rlib/foo.rs
similarity index 100%
rename from src/test/run-make/c-static-rlib/foo.rs
rename to src/test/run-make-fulldeps/c-static-rlib/foo.rs
diff --git a/src/test/run-make/cat-and-grep-sanity-check/Makefile b/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
similarity index 100%
rename from src/test/run-make/cat-and-grep-sanity-check/Makefile
rename to src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
diff --git a/src/test/run-make/cdylib-fewer-symbols/Makefile b/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile
similarity index 100%
rename from src/test/run-make/cdylib-fewer-symbols/Makefile
rename to src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile
diff --git a/src/test/run-make/cdylib-fewer-symbols/foo.rs b/src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
similarity index 100%
rename from src/test/run-make/cdylib-fewer-symbols/foo.rs
rename to src/test/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
diff --git a/src/test/run-make/cdylib/Makefile b/src/test/run-make-fulldeps/cdylib/Makefile
similarity index 100%
rename from src/test/run-make/cdylib/Makefile
rename to src/test/run-make-fulldeps/cdylib/Makefile
diff --git a/src/test/run-make/cdylib/bar.rs b/src/test/run-make-fulldeps/cdylib/bar.rs
similarity index 100%
rename from src/test/run-make/cdylib/bar.rs
rename to src/test/run-make-fulldeps/cdylib/bar.rs
diff --git a/src/test/run-make/cdylib/foo.c b/src/test/run-make-fulldeps/cdylib/foo.c
similarity index 100%
rename from src/test/run-make/cdylib/foo.c
rename to src/test/run-make-fulldeps/cdylib/foo.c
diff --git a/src/test/run-make/cdylib/foo.rs b/src/test/run-make-fulldeps/cdylib/foo.rs
similarity index 100%
rename from src/test/run-make/cdylib/foo.rs
rename to src/test/run-make-fulldeps/cdylib/foo.rs
diff --git a/src/test/run-make/codegen-options-parsing/Makefile b/src/test/run-make-fulldeps/codegen-options-parsing/Makefile
similarity index 100%
rename from src/test/run-make/codegen-options-parsing/Makefile
rename to src/test/run-make-fulldeps/codegen-options-parsing/Makefile
diff --git a/src/test/run-make/codegen-options-parsing/dummy.rs b/src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs
similarity index 100%
rename from src/test/run-make/codegen-options-parsing/dummy.rs
rename to src/test/run-make-fulldeps/codegen-options-parsing/dummy.rs
diff --git a/src/test/run-make/compile-stdin/Makefile b/src/test/run-make-fulldeps/compile-stdin/Makefile
similarity index 100%
rename from src/test/run-make/compile-stdin/Makefile
rename to src/test/run-make-fulldeps/compile-stdin/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths-2/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths-2/Makefile
rename to src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths-2/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths-2/a.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths-2/a.rs
diff --git a/src/test/run-make/compiler-lookup-paths-2/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths-2/b.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths-2/b.rs
diff --git a/src/test/run-make/compiler-lookup-paths-2/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths-2/c.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths-2/c.rs
diff --git a/src/test/run-make/compiler-lookup-paths/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/Makefile
rename to src/test/run-make-fulldeps/compiler-lookup-paths/Makefile
diff --git a/src/test/run-make/compiler-lookup-paths/a.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/a.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/a.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/a.rs
diff --git a/src/test/run-make/compiler-lookup-paths/b.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/b.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/b.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/b.rs
diff --git a/src/test/run-make/compiler-lookup-paths/c.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/c.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/c.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/c.rs
diff --git a/src/test/run-make/compiler-lookup-paths/d.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/d.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/d.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/d.rs
diff --git a/src/test/run-make/compiler-lookup-paths/e.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/e.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/e.rs
diff --git a/src/test/run-make/compiler-lookup-paths/e2.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/e2.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/e2.rs
diff --git a/src/test/run-make/compiler-lookup-paths/f.rs b/src/test/run-make-fulldeps/compiler-lookup-paths/f.rs
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/f.rs
rename to src/test/run-make-fulldeps/compiler-lookup-paths/f.rs
diff --git a/src/test/run-make/compiler-lookup-paths/native.c b/src/test/run-make-fulldeps/compiler-lookup-paths/native.c
similarity index 100%
rename from src/test/run-make/compiler-lookup-paths/native.c
rename to src/test/run-make-fulldeps/compiler-lookup-paths/native.c
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/Makefile b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
similarity index 100%
rename from src/test/run-make/compiler-rt-works-on-mingw/Makefile
rename to src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/foo.cpp b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
similarity index 100%
rename from src/test/run-make/compiler-rt-works-on-mingw/foo.cpp
rename to src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
diff --git a/src/test/run-make/compiler-rt-works-on-mingw/foo.rs b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
similarity index 100%
rename from src/test/run-make/compiler-rt-works-on-mingw/foo.rs
rename to src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
diff --git a/src/test/run-make/crate-data-smoke/Makefile b/src/test/run-make-fulldeps/crate-data-smoke/Makefile
similarity index 100%
rename from src/test/run-make/crate-data-smoke/Makefile
rename to src/test/run-make-fulldeps/crate-data-smoke/Makefile
diff --git a/src/test/run-make/crate-data-smoke/crate.rs b/src/test/run-make-fulldeps/crate-data-smoke/crate.rs
similarity index 100%
rename from src/test/run-make/crate-data-smoke/crate.rs
rename to src/test/run-make-fulldeps/crate-data-smoke/crate.rs
diff --git a/src/test/run-make/crate-data-smoke/lib.rs b/src/test/run-make-fulldeps/crate-data-smoke/lib.rs
similarity index 100%
rename from src/test/run-make/crate-data-smoke/lib.rs
rename to src/test/run-make-fulldeps/crate-data-smoke/lib.rs
diff --git a/src/test/run-make/crate-data-smoke/rlib.rs b/src/test/run-make-fulldeps/crate-data-smoke/rlib.rs
similarity index 100%
rename from src/test/run-make/crate-data-smoke/rlib.rs
rename to src/test/run-make-fulldeps/crate-data-smoke/rlib.rs
diff --git a/src/test/run-make/crate-name-priority/Makefile b/src/test/run-make-fulldeps/crate-name-priority/Makefile
similarity index 100%
rename from src/test/run-make/crate-name-priority/Makefile
rename to src/test/run-make-fulldeps/crate-name-priority/Makefile
diff --git a/src/test/run-make/crate-name-priority/foo.rs b/src/test/run-make-fulldeps/crate-name-priority/foo.rs
similarity index 100%
rename from src/test/run-make/crate-name-priority/foo.rs
rename to src/test/run-make-fulldeps/crate-name-priority/foo.rs
diff --git a/src/test/run-make/crate-name-priority/foo1.rs b/src/test/run-make-fulldeps/crate-name-priority/foo1.rs
similarity index 100%
rename from src/test/run-make/crate-name-priority/foo1.rs
rename to src/test/run-make-fulldeps/crate-name-priority/foo1.rs
diff --git a/src/test/run-make/debug-assertions/Makefile b/src/test/run-make-fulldeps/debug-assertions/Makefile
similarity index 100%
rename from src/test/run-make/debug-assertions/Makefile
rename to src/test/run-make-fulldeps/debug-assertions/Makefile
diff --git a/src/test/run-make/debug-assertions/debug.rs b/src/test/run-make-fulldeps/debug-assertions/debug.rs
similarity index 100%
rename from src/test/run-make/debug-assertions/debug.rs
rename to src/test/run-make-fulldeps/debug-assertions/debug.rs
diff --git a/src/test/run-make/dep-info-doesnt-run-much/Makefile b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
similarity index 100%
rename from src/test/run-make/dep-info-doesnt-run-much/Makefile
rename to src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile
diff --git a/src/test/run-make/dep-info-doesnt-run-much/foo.rs b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
similarity index 100%
rename from src/test/run-make/dep-info-doesnt-run-much/foo.rs
rename to src/test/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs
diff --git a/src/test/run-make/dep-info-spaces/Makefile b/src/test/run-make-fulldeps/dep-info-spaces/Makefile
similarity index 100%
rename from src/test/run-make/dep-info-spaces/Makefile
rename to src/test/run-make-fulldeps/dep-info-spaces/Makefile
diff --git a/src/test/run-make/dep-info-spaces/Makefile.foo b/src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo
similarity index 100%
rename from src/test/run-make/dep-info-spaces/Makefile.foo
rename to src/test/run-make-fulldeps/dep-info-spaces/Makefile.foo
diff --git a/src/test/run-make/dep-info-spaces/bar.rs b/src/test/run-make-fulldeps/dep-info-spaces/bar.rs
similarity index 100%
rename from src/test/run-make/dep-info-spaces/bar.rs
rename to src/test/run-make-fulldeps/dep-info-spaces/bar.rs
diff --git a/src/test/run-make/dep-info-spaces/foo foo.rs b/src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs
similarity index 100%
rename from src/test/run-make/dep-info-spaces/foo foo.rs
rename to src/test/run-make-fulldeps/dep-info-spaces/foo foo.rs
diff --git a/src/test/run-make/dep-info-spaces/lib.rs b/src/test/run-make-fulldeps/dep-info-spaces/lib.rs
similarity index 100%
rename from src/test/run-make/dep-info-spaces/lib.rs
rename to src/test/run-make-fulldeps/dep-info-spaces/lib.rs
diff --git a/src/test/run-make/dep-info/Makefile b/src/test/run-make-fulldeps/dep-info/Makefile
similarity index 100%
rename from src/test/run-make/dep-info/Makefile
rename to src/test/run-make-fulldeps/dep-info/Makefile
diff --git a/src/test/run-make/dep-info/Makefile.foo b/src/test/run-make-fulldeps/dep-info/Makefile.foo
similarity index 100%
rename from src/test/run-make/dep-info/Makefile.foo
rename to src/test/run-make-fulldeps/dep-info/Makefile.foo
diff --git a/src/test/run-make/dep-info/bar.rs b/src/test/run-make-fulldeps/dep-info/bar.rs
similarity index 100%
rename from src/test/run-make/dep-info/bar.rs
rename to src/test/run-make-fulldeps/dep-info/bar.rs
diff --git a/src/test/run-make/dep-info/foo.rs b/src/test/run-make-fulldeps/dep-info/foo.rs
similarity index 100%
rename from src/test/run-make/dep-info/foo.rs
rename to src/test/run-make-fulldeps/dep-info/foo.rs
diff --git a/src/test/run-make/dep-info/lib.rs b/src/test/run-make-fulldeps/dep-info/lib.rs
similarity index 100%
rename from src/test/run-make/dep-info/lib.rs
rename to src/test/run-make-fulldeps/dep-info/lib.rs
diff --git a/src/test/run-make/dep-info/lib2.rs b/src/test/run-make-fulldeps/dep-info/lib2.rs
similarity index 100%
rename from src/test/run-make/dep-info/lib2.rs
rename to src/test/run-make-fulldeps/dep-info/lib2.rs
diff --git a/src/test/run-make/duplicate-output-flavors/Makefile b/src/test/run-make-fulldeps/duplicate-output-flavors/Makefile
similarity index 100%
rename from src/test/run-make/duplicate-output-flavors/Makefile
rename to src/test/run-make-fulldeps/duplicate-output-flavors/Makefile
diff --git a/src/test/run-make/duplicate-output-flavors/foo.rs b/src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs
similarity index 100%
rename from src/test/run-make/duplicate-output-flavors/foo.rs
rename to src/test/run-make-fulldeps/duplicate-output-flavors/foo.rs
diff --git a/src/test/run-make/dylib-chain/Makefile b/src/test/run-make-fulldeps/dylib-chain/Makefile
similarity index 100%
rename from src/test/run-make/dylib-chain/Makefile
rename to src/test/run-make-fulldeps/dylib-chain/Makefile
diff --git a/src/test/run-make/dylib-chain/m1.rs b/src/test/run-make-fulldeps/dylib-chain/m1.rs
similarity index 100%
rename from src/test/run-make/dylib-chain/m1.rs
rename to src/test/run-make-fulldeps/dylib-chain/m1.rs
diff --git a/src/test/run-make/dylib-chain/m2.rs b/src/test/run-make-fulldeps/dylib-chain/m2.rs
similarity index 100%
rename from src/test/run-make/dylib-chain/m2.rs
rename to src/test/run-make-fulldeps/dylib-chain/m2.rs
diff --git a/src/test/run-make/dylib-chain/m3.rs b/src/test/run-make-fulldeps/dylib-chain/m3.rs
similarity index 100%
rename from src/test/run-make/dylib-chain/m3.rs
rename to src/test/run-make-fulldeps/dylib-chain/m3.rs
diff --git a/src/test/run-make/dylib-chain/m4.rs b/src/test/run-make-fulldeps/dylib-chain/m4.rs
similarity index 100%
rename from src/test/run-make/dylib-chain/m4.rs
rename to src/test/run-make-fulldeps/dylib-chain/m4.rs
diff --git a/src/test/run-make/emit/Makefile b/src/test/run-make-fulldeps/emit/Makefile
similarity index 100%
rename from src/test/run-make/emit/Makefile
rename to src/test/run-make-fulldeps/emit/Makefile
diff --git a/src/test/run-make/emit/test-24876.rs b/src/test/run-make-fulldeps/emit/test-24876.rs
similarity index 100%
rename from src/test/run-make/emit/test-24876.rs
rename to src/test/run-make-fulldeps/emit/test-24876.rs
diff --git a/src/test/run-make/emit/test-26235.rs b/src/test/run-make-fulldeps/emit/test-26235.rs
similarity index 100%
rename from src/test/run-make/emit/test-26235.rs
rename to src/test/run-make-fulldeps/emit/test-26235.rs
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/Makefile b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
similarity index 100%
rename from src/test/run-make/error-found-staticlib-instead-crate/Makefile
rename to src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/bar.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
similarity index 100%
rename from src/test/run-make/error-found-staticlib-instead-crate/bar.rs
rename to src/test/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs
diff --git a/src/test/run-make/error-found-staticlib-instead-crate/foo.rs b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
similarity index 100%
rename from src/test/run-make/error-found-staticlib-instead-crate/foo.rs
rename to src/test/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs
diff --git a/src/test/run-make/error-writing-dependencies/Makefile b/src/test/run-make-fulldeps/error-writing-dependencies/Makefile
similarity index 100%
rename from src/test/run-make/error-writing-dependencies/Makefile
rename to src/test/run-make-fulldeps/error-writing-dependencies/Makefile
diff --git a/src/test/run-make/error-writing-dependencies/foo.rs b/src/test/run-make-fulldeps/error-writing-dependencies/foo.rs
similarity index 100%
rename from src/test/run-make/error-writing-dependencies/foo.rs
rename to src/test/run-make-fulldeps/error-writing-dependencies/foo.rs
diff --git a/src/test/run-make/extern-diff-internal-name/Makefile b/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile
similarity index 100%
rename from src/test/run-make/extern-diff-internal-name/Makefile
rename to src/test/run-make-fulldeps/extern-diff-internal-name/Makefile
diff --git a/src/test/run-make/extern-diff-internal-name/lib.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs
similarity index 100%
rename from src/test/run-make/extern-diff-internal-name/lib.rs
rename to src/test/run-make-fulldeps/extern-diff-internal-name/lib.rs
diff --git a/src/test/run-make/extern-diff-internal-name/test.rs b/src/test/run-make-fulldeps/extern-diff-internal-name/test.rs
similarity index 100%
rename from src/test/run-make/extern-diff-internal-name/test.rs
rename to src/test/run-make-fulldeps/extern-diff-internal-name/test.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/Makefile b/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile
similarity index 100%
rename from src/test/run-make/extern-flag-disambiguates/Makefile
rename to src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile
diff --git a/src/test/run-make/extern-flag-disambiguates/a.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs
similarity index 100%
rename from src/test/run-make/extern-flag-disambiguates/a.rs
rename to src/test/run-make-fulldeps/extern-flag-disambiguates/a.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/b.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs
similarity index 100%
rename from src/test/run-make/extern-flag-disambiguates/b.rs
rename to src/test/run-make-fulldeps/extern-flag-disambiguates/b.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/c.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs
similarity index 100%
rename from src/test/run-make/extern-flag-disambiguates/c.rs
rename to src/test/run-make-fulldeps/extern-flag-disambiguates/c.rs
diff --git a/src/test/run-make/extern-flag-disambiguates/d.rs b/src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs
similarity index 100%
rename from src/test/run-make/extern-flag-disambiguates/d.rs
rename to src/test/run-make-fulldeps/extern-flag-disambiguates/d.rs
diff --git a/src/test/run-make/extern-flag-fun/Makefile b/src/test/run-make-fulldeps/extern-flag-fun/Makefile
similarity index 100%
rename from src/test/run-make/extern-flag-fun/Makefile
rename to src/test/run-make-fulldeps/extern-flag-fun/Makefile
diff --git a/src/test/run-make/extern-flag-fun/bar-alt.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs
similarity index 100%
rename from src/test/run-make/extern-flag-fun/bar-alt.rs
rename to src/test/run-make-fulldeps/extern-flag-fun/bar-alt.rs
diff --git a/src/test/run-make/extern-flag-fun/bar.rs b/src/test/run-make-fulldeps/extern-flag-fun/bar.rs
similarity index 100%
rename from src/test/run-make/extern-flag-fun/bar.rs
rename to src/test/run-make-fulldeps/extern-flag-fun/bar.rs
diff --git a/src/test/run-make/extern-flag-fun/foo.rs b/src/test/run-make-fulldeps/extern-flag-fun/foo.rs
similarity index 100%
rename from src/test/run-make/extern-flag-fun/foo.rs
rename to src/test/run-make-fulldeps/extern-flag-fun/foo.rs
diff --git a/src/test/run-make/extern-fn-generic/Makefile b/src/test/run-make-fulldeps/extern-fn-generic/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-generic/Makefile
rename to src/test/run-make-fulldeps/extern-fn-generic/Makefile
diff --git a/src/test/run-make/extern-fn-generic/test.c b/src/test/run-make-fulldeps/extern-fn-generic/test.c
similarity index 100%
rename from src/test/run-make/extern-fn-generic/test.c
rename to src/test/run-make-fulldeps/extern-fn-generic/test.c
diff --git a/src/test/run-make/extern-fn-generic/test.rs b/src/test/run-make-fulldeps/extern-fn-generic/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-generic/test.rs
rename to src/test/run-make-fulldeps/extern-fn-generic/test.rs
diff --git a/src/test/run-make/extern-fn-generic/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs
similarity index 100%
rename from src/test/run-make/extern-fn-generic/testcrate.rs
rename to src/test/run-make-fulldeps/extern-fn-generic/testcrate.rs
diff --git a/src/test/run-make/extern-fn-mangle/Makefile b/src/test/run-make-fulldeps/extern-fn-mangle/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-mangle/Makefile
rename to src/test/run-make-fulldeps/extern-fn-mangle/Makefile
diff --git a/src/test/run-make/extern-fn-mangle/test.c b/src/test/run-make-fulldeps/extern-fn-mangle/test.c
similarity index 100%
rename from src/test/run-make/extern-fn-mangle/test.c
rename to src/test/run-make-fulldeps/extern-fn-mangle/test.c
diff --git a/src/test/run-make/extern-fn-mangle/test.rs b/src/test/run-make-fulldeps/extern-fn-mangle/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-mangle/test.rs
rename to src/test/run-make-fulldeps/extern-fn-mangle/test.rs
diff --git a/src/test/run-make/extern-fn-reachable/Makefile b/src/test/run-make-fulldeps/extern-fn-reachable/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-reachable/Makefile
rename to src/test/run-make-fulldeps/extern-fn-reachable/Makefile
diff --git a/src/test/run-make/extern-fn-reachable/dylib.rs b/src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs
similarity index 100%
rename from src/test/run-make/extern-fn-reachable/dylib.rs
rename to src/test/run-make-fulldeps/extern-fn-reachable/dylib.rs
diff --git a/src/test/run-make/extern-fn-reachable/main.rs b/src/test/run-make-fulldeps/extern-fn-reachable/main.rs
similarity index 100%
rename from src/test/run-make/extern-fn-reachable/main.rs
rename to src/test/run-make-fulldeps/extern-fn-reachable/main.rs
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/Makefile b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-struct-passing-abi/Makefile
rename to src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/test.c b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
similarity index 100%
rename from src/test/run-make/extern-fn-struct-passing-abi/test.c
rename to src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.c
diff --git a/src/test/run-make/extern-fn-struct-passing-abi/test.rs b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-struct-passing-abi/test.rs
rename to src/test/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs
diff --git a/src/test/run-make/extern-fn-with-extern-types/Makefile b/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-with-extern-types/Makefile
rename to src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile
diff --git a/src/test/run-make/extern-fn-with-extern-types/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
similarity index 100%
rename from src/test/run-make/extern-fn-with-extern-types/ctest.c
rename to src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c
diff --git a/src/test/run-make/extern-fn-with-extern-types/test.rs b/src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-with-extern-types/test.rs
rename to src/test/run-make-fulldeps/extern-fn-with-extern-types/test.rs
diff --git a/src/test/run-make/extern-fn-with-packed-struct/Makefile b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-with-packed-struct/Makefile
rename to src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile
diff --git a/src/test/run-make/extern-fn-with-packed-struct/test.c b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c
similarity index 100%
rename from src/test/run-make/extern-fn-with-packed-struct/test.c
rename to src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c
diff --git a/src/test/run-make/extern-fn-with-packed-struct/test.rs b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-with-packed-struct/test.rs
rename to src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.rs
diff --git a/src/test/run-make/extern-fn-with-union/Makefile b/src/test/run-make-fulldeps/extern-fn-with-union/Makefile
similarity index 100%
rename from src/test/run-make/extern-fn-with-union/Makefile
rename to src/test/run-make-fulldeps/extern-fn-with-union/Makefile
diff --git a/src/test/run-make/extern-fn-with-union/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
similarity index 100%
rename from src/test/run-make/extern-fn-with-union/ctest.c
rename to src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
diff --git a/src/test/run-make/extern-fn-with-union/test.rs b/src/test/run-make-fulldeps/extern-fn-with-union/test.rs
similarity index 100%
rename from src/test/run-make/extern-fn-with-union/test.rs
rename to src/test/run-make-fulldeps/extern-fn-with-union/test.rs
diff --git a/src/test/run-make/extern-fn-with-union/testcrate.rs b/src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs
similarity index 100%
rename from src/test/run-make/extern-fn-with-union/testcrate.rs
rename to src/test/run-make-fulldeps/extern-fn-with-union/testcrate.rs
diff --git a/src/test/run-make/extern-multiple-copies/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies/Makefile
similarity index 100%
rename from src/test/run-make/extern-multiple-copies/Makefile
rename to src/test/run-make-fulldeps/extern-multiple-copies/Makefile
diff --git a/src/test/run-make/extern-multiple-copies/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies/bar.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies/bar.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies/bar.rs
diff --git a/src/test/run-make/extern-multiple-copies/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies/foo1.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies/foo1.rs
diff --git a/src/test/run-make/extern-multiple-copies/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies/foo2.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies/foo2.rs
diff --git a/src/test/run-make/extern-multiple-copies2/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile
similarity index 100%
rename from src/test/run-make/extern-multiple-copies2/Makefile
rename to src/test/run-make-fulldeps/extern-multiple-copies2/Makefile
diff --git a/src/test/run-make/extern-multiple-copies2/bar.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies2/bar.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies2/bar.rs
diff --git a/src/test/run-make/extern-multiple-copies2/foo1.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies2/foo1.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies2/foo1.rs
diff --git a/src/test/run-make/extern-multiple-copies2/foo2.rs b/src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs
similarity index 100%
rename from src/test/run-make/extern-multiple-copies2/foo2.rs
rename to src/test/run-make-fulldeps/extern-multiple-copies2/foo2.rs
diff --git a/src/test/run-make/extern-overrides-distribution/Makefile b/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile
similarity index 100%
rename from src/test/run-make/extern-overrides-distribution/Makefile
rename to src/test/run-make-fulldeps/extern-overrides-distribution/Makefile
diff --git a/src/test/run-make/extern-overrides-distribution/libc.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs
similarity index 100%
rename from src/test/run-make/extern-overrides-distribution/libc.rs
rename to src/test/run-make-fulldeps/extern-overrides-distribution/libc.rs
diff --git a/src/test/run-make/extern-overrides-distribution/main.rs b/src/test/run-make-fulldeps/extern-overrides-distribution/main.rs
similarity index 100%
rename from src/test/run-make/extern-overrides-distribution/main.rs
rename to src/test/run-make-fulldeps/extern-overrides-distribution/main.rs
diff --git a/src/test/run-make/extra-filename-with-temp-outputs/Makefile b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
similarity index 100%
rename from src/test/run-make/extra-filename-with-temp-outputs/Makefile
rename to src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile
diff --git a/src/test/run-make/extra-filename-with-temp-outputs/foo.rs b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
similarity index 100%
rename from src/test/run-make/extra-filename-with-temp-outputs/foo.rs
rename to src/test/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs
diff --git a/src/test/run-make/fpic/Makefile b/src/test/run-make-fulldeps/fpic/Makefile
similarity index 100%
rename from src/test/run-make/fpic/Makefile
rename to src/test/run-make-fulldeps/fpic/Makefile
diff --git a/src/test/run-make/fpic/hello.rs b/src/test/run-make-fulldeps/fpic/hello.rs
similarity index 100%
rename from src/test/run-make/fpic/hello.rs
rename to src/test/run-make-fulldeps/fpic/hello.rs
diff --git a/src/test/run-make/hir-tree/Makefile b/src/test/run-make-fulldeps/hir-tree/Makefile
similarity index 100%
rename from src/test/run-make/hir-tree/Makefile
rename to src/test/run-make-fulldeps/hir-tree/Makefile
diff --git a/src/test/run-make/hir-tree/input.rs b/src/test/run-make-fulldeps/hir-tree/input.rs
similarity index 100%
rename from src/test/run-make/hir-tree/input.rs
rename to src/test/run-make-fulldeps/hir-tree/input.rs
diff --git a/src/test/run-make/hotplug_codegen_backend/Makefile b/src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile
similarity index 100%
rename from src/test/run-make/hotplug_codegen_backend/Makefile
rename to src/test/run-make-fulldeps/hotplug_codegen_backend/Makefile
diff --git a/src/test/run-make/hotplug_codegen_backend/some_crate.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
similarity index 100%
rename from src/test/run-make/hotplug_codegen_backend/some_crate.rs
rename to src/test/run-make-fulldeps/hotplug_codegen_backend/some_crate.rs
diff --git a/src/test/run-make/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
similarity index 100%
rename from src/test/run-make/hotplug_codegen_backend/the_backend.rs
rename to src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
diff --git a/src/test/run-make/include_bytes_deps/Makefile b/src/test/run-make-fulldeps/include_bytes_deps/Makefile
similarity index 100%
rename from src/test/run-make/include_bytes_deps/Makefile
rename to src/test/run-make-fulldeps/include_bytes_deps/Makefile
diff --git a/src/test/run-make/include_bytes_deps/input.bin b/src/test/run-make-fulldeps/include_bytes_deps/input.bin
similarity index 100%
rename from src/test/run-make/include_bytes_deps/input.bin
rename to src/test/run-make-fulldeps/include_bytes_deps/input.bin
diff --git a/src/test/run-make/include_bytes_deps/input.md b/src/test/run-make-fulldeps/include_bytes_deps/input.md
similarity index 100%
rename from src/test/run-make/include_bytes_deps/input.md
rename to src/test/run-make-fulldeps/include_bytes_deps/input.md
diff --git a/src/test/run-make/include_bytes_deps/input.txt b/src/test/run-make-fulldeps/include_bytes_deps/input.txt
similarity index 100%
rename from src/test/run-make/include_bytes_deps/input.txt
rename to src/test/run-make-fulldeps/include_bytes_deps/input.txt
diff --git a/src/test/run-make/include_bytes_deps/main.rs b/src/test/run-make-fulldeps/include_bytes_deps/main.rs
similarity index 100%
rename from src/test/run-make/include_bytes_deps/main.rs
rename to src/test/run-make-fulldeps/include_bytes_deps/main.rs
diff --git a/src/test/run-make/inline-always-many-cgu/Makefile b/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile
similarity index 100%
rename from src/test/run-make/inline-always-many-cgu/Makefile
rename to src/test/run-make-fulldeps/inline-always-many-cgu/Makefile
diff --git a/src/test/run-make/inline-always-many-cgu/foo.rs b/src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs
similarity index 100%
rename from src/test/run-make/inline-always-many-cgu/foo.rs
rename to src/test/run-make-fulldeps/inline-always-many-cgu/foo.rs
diff --git a/src/test/run-make/interdependent-c-libraries/Makefile b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/Makefile
rename to src/test/run-make-fulldeps/interdependent-c-libraries/Makefile
diff --git a/src/test/run-make/interdependent-c-libraries/bar.c b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/bar.c
rename to src/test/run-make-fulldeps/interdependent-c-libraries/bar.c
diff --git a/src/test/run-make/interdependent-c-libraries/bar.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/bar.rs
rename to src/test/run-make-fulldeps/interdependent-c-libraries/bar.rs
diff --git a/src/test/run-make/interdependent-c-libraries/foo.c b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/foo.c
rename to src/test/run-make-fulldeps/interdependent-c-libraries/foo.c
diff --git a/src/test/run-make/interdependent-c-libraries/foo.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/foo.rs
rename to src/test/run-make-fulldeps/interdependent-c-libraries/foo.rs
diff --git a/src/test/run-make/interdependent-c-libraries/main.rs b/src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
similarity index 100%
rename from src/test/run-make/interdependent-c-libraries/main.rs
rename to src/test/run-make-fulldeps/interdependent-c-libraries/main.rs
diff --git a/src/test/run-make/intrinsic-unreachable/Makefile b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
similarity index 100%
rename from src/test/run-make/intrinsic-unreachable/Makefile
rename to src/test/run-make-fulldeps/intrinsic-unreachable/Makefile
diff --git a/src/test/run-make/intrinsic-unreachable/exit-ret.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
similarity index 100%
rename from src/test/run-make/intrinsic-unreachable/exit-ret.rs
rename to src/test/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs
diff --git a/src/test/run-make/intrinsic-unreachable/exit-unreachable.rs b/src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
similarity index 100%
rename from src/test/run-make/intrinsic-unreachable/exit-unreachable.rs
rename to src/test/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs
diff --git a/src/test/run-make/invalid-library/Makefile b/src/test/run-make-fulldeps/invalid-library/Makefile
similarity index 100%
rename from src/test/run-make/invalid-library/Makefile
rename to src/test/run-make-fulldeps/invalid-library/Makefile
diff --git a/src/test/run-make/invalid-library/foo.rs b/src/test/run-make-fulldeps/invalid-library/foo.rs
similarity index 100%
rename from src/test/run-make/invalid-library/foo.rs
rename to src/test/run-make-fulldeps/invalid-library/foo.rs
diff --git a/src/test/run-make/invalid-staticlib/Makefile b/src/test/run-make-fulldeps/invalid-staticlib/Makefile
similarity index 100%
rename from src/test/run-make/invalid-staticlib/Makefile
rename to src/test/run-make-fulldeps/invalid-staticlib/Makefile
diff --git a/src/test/run-make/issue-11908/Makefile b/src/test/run-make-fulldeps/issue-11908/Makefile
similarity index 100%
rename from src/test/run-make/issue-11908/Makefile
rename to src/test/run-make-fulldeps/issue-11908/Makefile
diff --git a/src/test/run-make/issue-11908/bar.rs b/src/test/run-make-fulldeps/issue-11908/bar.rs
similarity index 100%
rename from src/test/run-make/issue-11908/bar.rs
rename to src/test/run-make-fulldeps/issue-11908/bar.rs
diff --git a/src/test/run-make/issue-11908/foo.rs b/src/test/run-make-fulldeps/issue-11908/foo.rs
similarity index 100%
rename from src/test/run-make/issue-11908/foo.rs
rename to src/test/run-make-fulldeps/issue-11908/foo.rs
diff --git a/src/test/run-make/issue-14500/Makefile b/src/test/run-make-fulldeps/issue-14500/Makefile
similarity index 100%
rename from src/test/run-make/issue-14500/Makefile
rename to src/test/run-make-fulldeps/issue-14500/Makefile
diff --git a/src/test/run-make/issue-14500/bar.rs b/src/test/run-make-fulldeps/issue-14500/bar.rs
similarity index 100%
rename from src/test/run-make/issue-14500/bar.rs
rename to src/test/run-make-fulldeps/issue-14500/bar.rs
diff --git a/src/test/run-make/issue-14500/foo.c b/src/test/run-make-fulldeps/issue-14500/foo.c
similarity index 100%
rename from src/test/run-make/issue-14500/foo.c
rename to src/test/run-make-fulldeps/issue-14500/foo.c
diff --git a/src/test/run-make/issue-14500/foo.rs b/src/test/run-make-fulldeps/issue-14500/foo.rs
similarity index 100%
rename from src/test/run-make/issue-14500/foo.rs
rename to src/test/run-make-fulldeps/issue-14500/foo.rs
diff --git a/src/test/run-make/issue-14698/Makefile b/src/test/run-make-fulldeps/issue-14698/Makefile
similarity index 100%
rename from src/test/run-make/issue-14698/Makefile
rename to src/test/run-make-fulldeps/issue-14698/Makefile
diff --git a/src/test/run-make/issue-14698/foo.rs b/src/test/run-make-fulldeps/issue-14698/foo.rs
similarity index 100%
rename from src/test/run-make/issue-14698/foo.rs
rename to src/test/run-make-fulldeps/issue-14698/foo.rs
diff --git a/src/test/run-make/issue-15460/Makefile b/src/test/run-make-fulldeps/issue-15460/Makefile
similarity index 100%
rename from src/test/run-make/issue-15460/Makefile
rename to src/test/run-make-fulldeps/issue-15460/Makefile
diff --git a/src/test/run-make/issue-15460/bar.rs b/src/test/run-make-fulldeps/issue-15460/bar.rs
similarity index 100%
rename from src/test/run-make/issue-15460/bar.rs
rename to src/test/run-make-fulldeps/issue-15460/bar.rs
diff --git a/src/test/run-make/issue-15460/foo.c b/src/test/run-make-fulldeps/issue-15460/foo.c
similarity index 100%
rename from src/test/run-make/issue-15460/foo.c
rename to src/test/run-make-fulldeps/issue-15460/foo.c
diff --git a/src/test/run-make/issue-15460/foo.rs b/src/test/run-make-fulldeps/issue-15460/foo.rs
similarity index 100%
rename from src/test/run-make/issue-15460/foo.rs
rename to src/test/run-make-fulldeps/issue-15460/foo.rs
diff --git a/src/test/run-make/issue-18943/Makefile b/src/test/run-make-fulldeps/issue-18943/Makefile
similarity index 100%
rename from src/test/run-make/issue-18943/Makefile
rename to src/test/run-make-fulldeps/issue-18943/Makefile
diff --git a/src/test/run-make/issue-18943/foo.rs b/src/test/run-make-fulldeps/issue-18943/foo.rs
similarity index 100%
rename from src/test/run-make/issue-18943/foo.rs
rename to src/test/run-make-fulldeps/issue-18943/foo.rs
diff --git a/src/test/run-make/issue-19371/Makefile b/src/test/run-make-fulldeps/issue-19371/Makefile
similarity index 100%
rename from src/test/run-make/issue-19371/Makefile
rename to src/test/run-make-fulldeps/issue-19371/Makefile
diff --git a/src/test/run-make/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs
similarity index 100%
rename from src/test/run-make/issue-19371/foo.rs
rename to src/test/run-make-fulldeps/issue-19371/foo.rs
diff --git a/src/test/run-make/issue-20626/Makefile b/src/test/run-make-fulldeps/issue-20626/Makefile
similarity index 100%
rename from src/test/run-make/issue-20626/Makefile
rename to src/test/run-make-fulldeps/issue-20626/Makefile
diff --git a/src/test/run-make/issue-20626/foo.rs b/src/test/run-make-fulldeps/issue-20626/foo.rs
similarity index 100%
rename from src/test/run-make/issue-20626/foo.rs
rename to src/test/run-make-fulldeps/issue-20626/foo.rs
diff --git a/src/test/run-make/issue-22131/Makefile b/src/test/run-make-fulldeps/issue-22131/Makefile
similarity index 100%
rename from src/test/run-make/issue-22131/Makefile
rename to src/test/run-make-fulldeps/issue-22131/Makefile
diff --git a/src/test/run-make/issue-22131/foo.rs b/src/test/run-make-fulldeps/issue-22131/foo.rs
similarity index 100%
rename from src/test/run-make/issue-22131/foo.rs
rename to src/test/run-make-fulldeps/issue-22131/foo.rs
diff --git a/src/test/run-make/issue-24445/Makefile b/src/test/run-make-fulldeps/issue-24445/Makefile
similarity index 100%
rename from src/test/run-make/issue-24445/Makefile
rename to src/test/run-make-fulldeps/issue-24445/Makefile
diff --git a/src/test/run-make/issue-24445/foo.c b/src/test/run-make-fulldeps/issue-24445/foo.c
similarity index 100%
rename from src/test/run-make/issue-24445/foo.c
rename to src/test/run-make-fulldeps/issue-24445/foo.c
diff --git a/src/test/run-make/issue-24445/foo.rs b/src/test/run-make-fulldeps/issue-24445/foo.rs
similarity index 100%
rename from src/test/run-make/issue-24445/foo.rs
rename to src/test/run-make-fulldeps/issue-24445/foo.rs
diff --git a/src/test/run-make/issue-25581/Makefile b/src/test/run-make-fulldeps/issue-25581/Makefile
similarity index 100%
rename from src/test/run-make/issue-25581/Makefile
rename to src/test/run-make-fulldeps/issue-25581/Makefile
diff --git a/src/test/run-make/issue-25581/test.c b/src/test/run-make-fulldeps/issue-25581/test.c
similarity index 100%
rename from src/test/run-make/issue-25581/test.c
rename to src/test/run-make-fulldeps/issue-25581/test.c
diff --git a/src/test/run-make/issue-25581/test.rs b/src/test/run-make-fulldeps/issue-25581/test.rs
similarity index 100%
rename from src/test/run-make/issue-25581/test.rs
rename to src/test/run-make-fulldeps/issue-25581/test.rs
diff --git a/src/test/run-make/issue-26006/Makefile b/src/test/run-make-fulldeps/issue-26006/Makefile
similarity index 100%
rename from src/test/run-make/issue-26006/Makefile
rename to src/test/run-make-fulldeps/issue-26006/Makefile
diff --git a/src/test/run-make/issue-26006/in/libc/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs
similarity index 100%
rename from src/test/run-make/issue-26006/in/libc/lib.rs
rename to src/test/run-make-fulldeps/issue-26006/in/libc/lib.rs
diff --git a/src/test/run-make/issue-26006/in/time/lib.rs b/src/test/run-make-fulldeps/issue-26006/in/time/lib.rs
similarity index 100%
rename from src/test/run-make/issue-26006/in/time/lib.rs
rename to src/test/run-make-fulldeps/issue-26006/in/time/lib.rs
diff --git a/src/test/run-make/issue-26092/Makefile b/src/test/run-make-fulldeps/issue-26092/Makefile
similarity index 100%
rename from src/test/run-make/issue-26092/Makefile
rename to src/test/run-make-fulldeps/issue-26092/Makefile
diff --git a/src/test/run-make/issue-26092/blank.rs b/src/test/run-make-fulldeps/issue-26092/blank.rs
similarity index 100%
rename from src/test/run-make/issue-26092/blank.rs
rename to src/test/run-make-fulldeps/issue-26092/blank.rs
diff --git a/src/test/run-make/issue-28595/Makefile b/src/test/run-make-fulldeps/issue-28595/Makefile
similarity index 100%
rename from src/test/run-make/issue-28595/Makefile
rename to src/test/run-make-fulldeps/issue-28595/Makefile
diff --git a/src/test/run-make/issue-28595/a.c b/src/test/run-make-fulldeps/issue-28595/a.c
similarity index 100%
rename from src/test/run-make/issue-28595/a.c
rename to src/test/run-make-fulldeps/issue-28595/a.c
diff --git a/src/test/run-make/issue-28595/a.rs b/src/test/run-make-fulldeps/issue-28595/a.rs
similarity index 100%
rename from src/test/run-make/issue-28595/a.rs
rename to src/test/run-make-fulldeps/issue-28595/a.rs
diff --git a/src/test/run-make/issue-28595/b.c b/src/test/run-make-fulldeps/issue-28595/b.c
similarity index 100%
rename from src/test/run-make/issue-28595/b.c
rename to src/test/run-make-fulldeps/issue-28595/b.c
diff --git a/src/test/run-make/issue-28595/b.rs b/src/test/run-make-fulldeps/issue-28595/b.rs
similarity index 100%
rename from src/test/run-make/issue-28595/b.rs
rename to src/test/run-make-fulldeps/issue-28595/b.rs
diff --git a/src/test/run-make/issue-28766/Makefile b/src/test/run-make-fulldeps/issue-28766/Makefile
similarity index 100%
rename from src/test/run-make/issue-28766/Makefile
rename to src/test/run-make-fulldeps/issue-28766/Makefile
diff --git a/src/test/run-make/issue-28766/foo.rs b/src/test/run-make-fulldeps/issue-28766/foo.rs
similarity index 100%
rename from src/test/run-make/issue-28766/foo.rs
rename to src/test/run-make-fulldeps/issue-28766/foo.rs
diff --git a/src/test/run-make/issue-28766/main.rs b/src/test/run-make-fulldeps/issue-28766/main.rs
similarity index 100%
rename from src/test/run-make/issue-28766/main.rs
rename to src/test/run-make-fulldeps/issue-28766/main.rs
diff --git a/src/test/run-make/issue-30063/Makefile b/src/test/run-make-fulldeps/issue-30063/Makefile
similarity index 100%
rename from src/test/run-make/issue-30063/Makefile
rename to src/test/run-make-fulldeps/issue-30063/Makefile
diff --git a/src/test/run-make/issue-30063/foo.rs b/src/test/run-make-fulldeps/issue-30063/foo.rs
similarity index 100%
rename from src/test/run-make/issue-30063/foo.rs
rename to src/test/run-make-fulldeps/issue-30063/foo.rs
diff --git a/src/test/run-make/issue-33329/Makefile b/src/test/run-make-fulldeps/issue-33329/Makefile
similarity index 100%
rename from src/test/run-make/issue-33329/Makefile
rename to src/test/run-make-fulldeps/issue-33329/Makefile
diff --git a/src/test/run-make/issue-33329/main.rs b/src/test/run-make-fulldeps/issue-33329/main.rs
similarity index 100%
rename from src/test/run-make/issue-33329/main.rs
rename to src/test/run-make-fulldeps/issue-33329/main.rs
diff --git a/src/test/run-make/issue-35164/Makefile b/src/test/run-make-fulldeps/issue-35164/Makefile
similarity index 100%
rename from src/test/run-make/issue-35164/Makefile
rename to src/test/run-make-fulldeps/issue-35164/Makefile
diff --git a/src/test/run-make/issue-35164/main.rs b/src/test/run-make-fulldeps/issue-35164/main.rs
similarity index 100%
rename from src/test/run-make/issue-35164/main.rs
rename to src/test/run-make-fulldeps/issue-35164/main.rs
diff --git a/src/test/run-make/issue-35164/submodule/mod.rs b/src/test/run-make-fulldeps/issue-35164/submodule/mod.rs
similarity index 100%
rename from src/test/run-make/issue-35164/submodule/mod.rs
rename to src/test/run-make-fulldeps/issue-35164/submodule/mod.rs
diff --git a/src/test/run-make/issue-37839/Makefile b/src/test/run-make-fulldeps/issue-37839/Makefile
similarity index 100%
rename from src/test/run-make/issue-37839/Makefile
rename to src/test/run-make-fulldeps/issue-37839/Makefile
diff --git a/src/test/run-make/issue-37839/a.rs b/src/test/run-make-fulldeps/issue-37839/a.rs
similarity index 100%
rename from src/test/run-make/issue-37839/a.rs
rename to src/test/run-make-fulldeps/issue-37839/a.rs
diff --git a/src/test/run-make/issue-37839/b.rs b/src/test/run-make-fulldeps/issue-37839/b.rs
similarity index 100%
rename from src/test/run-make/issue-37839/b.rs
rename to src/test/run-make-fulldeps/issue-37839/b.rs
diff --git a/src/test/run-make/issue-37839/c.rs b/src/test/run-make-fulldeps/issue-37839/c.rs
similarity index 100%
rename from src/test/run-make/issue-37839/c.rs
rename to src/test/run-make-fulldeps/issue-37839/c.rs
diff --git a/src/test/run-make/issue-37893/Makefile b/src/test/run-make-fulldeps/issue-37893/Makefile
similarity index 100%
rename from src/test/run-make/issue-37893/Makefile
rename to src/test/run-make-fulldeps/issue-37893/Makefile
diff --git a/src/test/run-make/issue-37893/a.rs b/src/test/run-make-fulldeps/issue-37893/a.rs
similarity index 100%
rename from src/test/run-make/issue-37893/a.rs
rename to src/test/run-make-fulldeps/issue-37893/a.rs
diff --git a/src/test/run-make/issue-37893/b.rs b/src/test/run-make-fulldeps/issue-37893/b.rs
similarity index 100%
rename from src/test/run-make/issue-37893/b.rs
rename to src/test/run-make-fulldeps/issue-37893/b.rs
diff --git a/src/test/run-make/issue-37893/c.rs b/src/test/run-make-fulldeps/issue-37893/c.rs
similarity index 100%
rename from src/test/run-make/issue-37893/c.rs
rename to src/test/run-make-fulldeps/issue-37893/c.rs
diff --git a/src/test/run-make/issue-38237/Makefile b/src/test/run-make-fulldeps/issue-38237/Makefile
similarity index 100%
rename from src/test/run-make/issue-38237/Makefile
rename to src/test/run-make-fulldeps/issue-38237/Makefile
diff --git a/src/test/run-make/issue-38237/bar.rs b/src/test/run-make-fulldeps/issue-38237/bar.rs
similarity index 100%
rename from src/test/run-make/issue-38237/bar.rs
rename to src/test/run-make-fulldeps/issue-38237/bar.rs
diff --git a/src/test/run-make/issue-38237/baz.rs b/src/test/run-make-fulldeps/issue-38237/baz.rs
similarity index 100%
rename from src/test/run-make/issue-38237/baz.rs
rename to src/test/run-make-fulldeps/issue-38237/baz.rs
diff --git a/src/test/run-make/issue-38237/foo.rs b/src/test/run-make-fulldeps/issue-38237/foo.rs
similarity index 100%
rename from src/test/run-make/issue-38237/foo.rs
rename to src/test/run-make-fulldeps/issue-38237/foo.rs
diff --git a/src/test/run-make/issue-40535/Makefile b/src/test/run-make-fulldeps/issue-40535/Makefile
similarity index 100%
rename from src/test/run-make/issue-40535/Makefile
rename to src/test/run-make-fulldeps/issue-40535/Makefile
diff --git a/src/test/run-make/issue-40535/bar.rs b/src/test/run-make-fulldeps/issue-40535/bar.rs
similarity index 100%
rename from src/test/run-make/issue-40535/bar.rs
rename to src/test/run-make-fulldeps/issue-40535/bar.rs
diff --git a/src/test/run-make/issue-40535/baz.rs b/src/test/run-make-fulldeps/issue-40535/baz.rs
similarity index 100%
rename from src/test/run-make/issue-40535/baz.rs
rename to src/test/run-make-fulldeps/issue-40535/baz.rs
diff --git a/src/test/run-make/issue-40535/foo.rs b/src/test/run-make-fulldeps/issue-40535/foo.rs
similarity index 100%
rename from src/test/run-make/issue-40535/foo.rs
rename to src/test/run-make-fulldeps/issue-40535/foo.rs
diff --git a/src/test/run-make/issue-46239/Makefile b/src/test/run-make-fulldeps/issue-46239/Makefile
similarity index 100%
rename from src/test/run-make/issue-46239/Makefile
rename to src/test/run-make-fulldeps/issue-46239/Makefile
diff --git a/src/test/run-make/issue-46239/main.rs b/src/test/run-make-fulldeps/issue-46239/main.rs
similarity index 100%
rename from src/test/run-make/issue-46239/main.rs
rename to src/test/run-make-fulldeps/issue-46239/main.rs
diff --git a/src/test/run-make/issue-7349/Makefile b/src/test/run-make-fulldeps/issue-7349/Makefile
similarity index 100%
rename from src/test/run-make/issue-7349/Makefile
rename to src/test/run-make-fulldeps/issue-7349/Makefile
diff --git a/src/test/run-make/issue-7349/foo.rs b/src/test/run-make-fulldeps/issue-7349/foo.rs
similarity index 100%
rename from src/test/run-make/issue-7349/foo.rs
rename to src/test/run-make-fulldeps/issue-7349/foo.rs
diff --git a/src/test/run-make/issues-41478-43796/Makefile b/src/test/run-make-fulldeps/issues-41478-43796/Makefile
similarity index 100%
rename from src/test/run-make/issues-41478-43796/Makefile
rename to src/test/run-make-fulldeps/issues-41478-43796/Makefile
diff --git a/src/test/run-make/issues-41478-43796/a.rs b/src/test/run-make-fulldeps/issues-41478-43796/a.rs
similarity index 100%
rename from src/test/run-make/issues-41478-43796/a.rs
rename to src/test/run-make-fulldeps/issues-41478-43796/a.rs
diff --git a/src/test/run-make/libs-and-bins/Makefile b/src/test/run-make-fulldeps/libs-and-bins/Makefile
similarity index 100%
rename from src/test/run-make/libs-and-bins/Makefile
rename to src/test/run-make-fulldeps/libs-and-bins/Makefile
diff --git a/src/test/run-make/libs-and-bins/foo.rs b/src/test/run-make-fulldeps/libs-and-bins/foo.rs
similarity index 100%
rename from src/test/run-make/libs-and-bins/foo.rs
rename to src/test/run-make-fulldeps/libs-and-bins/foo.rs
diff --git a/src/test/run-make/libs-through-symlinks/Makefile b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile
similarity index 100%
rename from src/test/run-make/libs-through-symlinks/Makefile
rename to src/test/run-make-fulldeps/libs-through-symlinks/Makefile
diff --git a/src/test/run-make/libs-through-symlinks/bar.rs b/src/test/run-make-fulldeps/libs-through-symlinks/bar.rs
similarity index 100%
rename from src/test/run-make/libs-through-symlinks/bar.rs
rename to src/test/run-make-fulldeps/libs-through-symlinks/bar.rs
diff --git a/src/test/run-make/libs-through-symlinks/foo.rs b/src/test/run-make-fulldeps/libs-through-symlinks/foo.rs
similarity index 100%
rename from src/test/run-make/libs-through-symlinks/foo.rs
rename to src/test/run-make-fulldeps/libs-through-symlinks/foo.rs
diff --git a/src/test/run-make/libtest-json/Makefile b/src/test/run-make-fulldeps/libtest-json/Makefile
similarity index 100%
rename from src/test/run-make/libtest-json/Makefile
rename to src/test/run-make-fulldeps/libtest-json/Makefile
diff --git a/src/test/run-make/libtest-json/f.rs b/src/test/run-make-fulldeps/libtest-json/f.rs
similarity index 100%
rename from src/test/run-make/libtest-json/f.rs
rename to src/test/run-make-fulldeps/libtest-json/f.rs
diff --git a/src/test/run-make/libtest-json/output.json b/src/test/run-make-fulldeps/libtest-json/output.json
similarity index 100%
rename from src/test/run-make/libtest-json/output.json
rename to src/test/run-make-fulldeps/libtest-json/output.json
diff --git a/src/test/run-make/libtest-json/validate_json.py b/src/test/run-make-fulldeps/libtest-json/validate_json.py
similarity index 100%
rename from src/test/run-make/libtest-json/validate_json.py
rename to src/test/run-make-fulldeps/libtest-json/validate_json.py
diff --git a/src/test/run-make/link-arg/Makefile b/src/test/run-make-fulldeps/link-arg/Makefile
similarity index 100%
rename from src/test/run-make/link-arg/Makefile
rename to src/test/run-make-fulldeps/link-arg/Makefile
diff --git a/src/test/run-make/link-arg/empty.rs b/src/test/run-make-fulldeps/link-arg/empty.rs
similarity index 100%
rename from src/test/run-make/link-arg/empty.rs
rename to src/test/run-make-fulldeps/link-arg/empty.rs
diff --git a/src/test/run-make/link-cfg/Makefile b/src/test/run-make-fulldeps/link-cfg/Makefile
similarity index 100%
rename from src/test/run-make/link-cfg/Makefile
rename to src/test/run-make-fulldeps/link-cfg/Makefile
diff --git a/src/test/run-make/link-cfg/dep-with-staticlib.rs b/src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
similarity index 100%
rename from src/test/run-make/link-cfg/dep-with-staticlib.rs
rename to src/test/run-make-fulldeps/link-cfg/dep-with-staticlib.rs
diff --git a/src/test/run-make/link-cfg/dep.rs b/src/test/run-make-fulldeps/link-cfg/dep.rs
similarity index 100%
rename from src/test/run-make/link-cfg/dep.rs
rename to src/test/run-make-fulldeps/link-cfg/dep.rs
diff --git a/src/test/run-make/link-cfg/no-deps.rs b/src/test/run-make-fulldeps/link-cfg/no-deps.rs
similarity index 100%
rename from src/test/run-make/link-cfg/no-deps.rs
rename to src/test/run-make-fulldeps/link-cfg/no-deps.rs
diff --git a/src/test/run-make/link-cfg/return1.c b/src/test/run-make-fulldeps/link-cfg/return1.c
similarity index 100%
rename from src/test/run-make/link-cfg/return1.c
rename to src/test/run-make-fulldeps/link-cfg/return1.c
diff --git a/src/test/run-make/link-cfg/return2.c b/src/test/run-make-fulldeps/link-cfg/return2.c
similarity index 100%
rename from src/test/run-make/link-cfg/return2.c
rename to src/test/run-make-fulldeps/link-cfg/return2.c
diff --git a/src/test/run-make/link-cfg/return3.c b/src/test/run-make-fulldeps/link-cfg/return3.c
similarity index 100%
rename from src/test/run-make/link-cfg/return3.c
rename to src/test/run-make-fulldeps/link-cfg/return3.c
diff --git a/src/test/run-make/link-cfg/with-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-deps.rs
similarity index 100%
rename from src/test/run-make/link-cfg/with-deps.rs
rename to src/test/run-make-fulldeps/link-cfg/with-deps.rs
diff --git a/src/test/run-make/link-cfg/with-staticlib-deps.rs b/src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
similarity index 100%
rename from src/test/run-make/link-cfg/with-staticlib-deps.rs
rename to src/test/run-make-fulldeps/link-cfg/with-staticlib-deps.rs
diff --git a/src/test/run-make/link-path-order/Makefile b/src/test/run-make-fulldeps/link-path-order/Makefile
similarity index 100%
rename from src/test/run-make/link-path-order/Makefile
rename to src/test/run-make-fulldeps/link-path-order/Makefile
diff --git a/src/test/run-make/link-path-order/correct.c b/src/test/run-make-fulldeps/link-path-order/correct.c
similarity index 100%
rename from src/test/run-make/link-path-order/correct.c
rename to src/test/run-make-fulldeps/link-path-order/correct.c
diff --git a/src/test/run-make/link-path-order/main.rs b/src/test/run-make-fulldeps/link-path-order/main.rs
similarity index 100%
rename from src/test/run-make/link-path-order/main.rs
rename to src/test/run-make-fulldeps/link-path-order/main.rs
diff --git a/src/test/run-make/link-path-order/wrong.c b/src/test/run-make-fulldeps/link-path-order/wrong.c
similarity index 100%
rename from src/test/run-make/link-path-order/wrong.c
rename to src/test/run-make-fulldeps/link-path-order/wrong.c
diff --git a/src/test/run-make/linkage-attr-on-static/Makefile b/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile
similarity index 100%
rename from src/test/run-make/linkage-attr-on-static/Makefile
rename to src/test/run-make-fulldeps/linkage-attr-on-static/Makefile
diff --git a/src/test/run-make/linkage-attr-on-static/bar.rs b/src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs
similarity index 100%
rename from src/test/run-make/linkage-attr-on-static/bar.rs
rename to src/test/run-make-fulldeps/linkage-attr-on-static/bar.rs
diff --git a/src/test/run-make/linkage-attr-on-static/foo.c b/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
similarity index 100%
rename from src/test/run-make/linkage-attr-on-static/foo.c
rename to src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
diff --git a/src/test/run-make/linker-output-non-utf8/Makefile b/src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
similarity index 100%
rename from src/test/run-make/linker-output-non-utf8/Makefile
rename to src/test/run-make-fulldeps/linker-output-non-utf8/Makefile
diff --git a/src/test/run-make/linker-output-non-utf8/exec.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs
similarity index 100%
rename from src/test/run-make/linker-output-non-utf8/exec.rs
rename to src/test/run-make-fulldeps/linker-output-non-utf8/exec.rs
diff --git a/src/test/run-make/linker-output-non-utf8/library.rs b/src/test/run-make-fulldeps/linker-output-non-utf8/library.rs
similarity index 100%
rename from src/test/run-make/linker-output-non-utf8/library.rs
rename to src/test/run-make-fulldeps/linker-output-non-utf8/library.rs
diff --git a/src/test/run-make/llvm-pass/Makefile b/src/test/run-make-fulldeps/llvm-pass/Makefile
similarity index 100%
rename from src/test/run-make/llvm-pass/Makefile
rename to src/test/run-make-fulldeps/llvm-pass/Makefile
diff --git a/src/test/run-make/llvm-pass/llvm-function-pass.so.cc b/src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc
similarity index 100%
rename from src/test/run-make/llvm-pass/llvm-function-pass.so.cc
rename to src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc
diff --git a/src/test/run-make/llvm-pass/llvm-module-pass.so.cc b/src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc
similarity index 100%
rename from src/test/run-make/llvm-pass/llvm-module-pass.so.cc
rename to src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc
diff --git a/src/test/run-make/llvm-pass/main.rs b/src/test/run-make-fulldeps/llvm-pass/main.rs
similarity index 100%
rename from src/test/run-make/llvm-pass/main.rs
rename to src/test/run-make-fulldeps/llvm-pass/main.rs
diff --git a/src/test/run-make/llvm-pass/plugin.rs b/src/test/run-make-fulldeps/llvm-pass/plugin.rs
similarity index 100%
rename from src/test/run-make/llvm-pass/plugin.rs
rename to src/test/run-make-fulldeps/llvm-pass/plugin.rs
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
similarity index 100%
rename from src/test/run-make/long-linker-command-lines-cmd-exe/Makefile
rename to src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.bat b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
similarity index 100%
rename from src/test/run-make/long-linker-command-lines-cmd-exe/foo.bat
rename to src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat
diff --git a/src/test/run-make/long-linker-command-lines-cmd-exe/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
similarity index 100%
rename from src/test/run-make/long-linker-command-lines-cmd-exe/foo.rs
rename to src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs
diff --git a/src/test/run-make/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile
similarity index 100%
rename from src/test/run-make/long-linker-command-lines/Makefile
rename to src/test/run-make-fulldeps/long-linker-command-lines/Makefile
diff --git a/src/test/run-make/long-linker-command-lines/foo.rs b/src/test/run-make-fulldeps/long-linker-command-lines/foo.rs
similarity index 100%
rename from src/test/run-make/long-linker-command-lines/foo.rs
rename to src/test/run-make-fulldeps/long-linker-command-lines/foo.rs
diff --git a/src/test/run-make/longjmp-across-rust/Makefile b/src/test/run-make-fulldeps/longjmp-across-rust/Makefile
similarity index 100%
rename from src/test/run-make/longjmp-across-rust/Makefile
rename to src/test/run-make-fulldeps/longjmp-across-rust/Makefile
diff --git a/src/test/run-make/longjmp-across-rust/foo.c b/src/test/run-make-fulldeps/longjmp-across-rust/foo.c
similarity index 100%
rename from src/test/run-make/longjmp-across-rust/foo.c
rename to src/test/run-make-fulldeps/longjmp-across-rust/foo.c
diff --git a/src/test/run-make/longjmp-across-rust/main.rs b/src/test/run-make-fulldeps/longjmp-across-rust/main.rs
similarity index 100%
rename from src/test/run-make/longjmp-across-rust/main.rs
rename to src/test/run-make-fulldeps/longjmp-across-rust/main.rs
diff --git a/src/test/run-make/ls-metadata/Makefile b/src/test/run-make-fulldeps/ls-metadata/Makefile
similarity index 100%
rename from src/test/run-make/ls-metadata/Makefile
rename to src/test/run-make-fulldeps/ls-metadata/Makefile
diff --git a/src/test/run-make/ls-metadata/foo.rs b/src/test/run-make-fulldeps/ls-metadata/foo.rs
similarity index 100%
rename from src/test/run-make/ls-metadata/foo.rs
rename to src/test/run-make-fulldeps/ls-metadata/foo.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/Makefile b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/Makefile
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile
diff --git a/src/test/run-make/lto-no-link-whole-rlib/bar.c b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/bar.c
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/bar.c
diff --git a/src/test/run-make/lto-no-link-whole-rlib/foo.c b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/foo.c
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/foo.c
diff --git a/src/test/run-make/lto-no-link-whole-rlib/lib1.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/lib1.rs
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/lib2.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/lib2.rs
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs
diff --git a/src/test/run-make/lto-no-link-whole-rlib/main.rs b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
similarity index 100%
rename from src/test/run-make/lto-no-link-whole-rlib/main.rs
rename to src/test/run-make-fulldeps/lto-no-link-whole-rlib/main.rs
diff --git a/src/test/run-make/lto-readonly-lib/Makefile b/src/test/run-make-fulldeps/lto-readonly-lib/Makefile
similarity index 100%
rename from src/test/run-make/lto-readonly-lib/Makefile
rename to src/test/run-make-fulldeps/lto-readonly-lib/Makefile
diff --git a/src/test/run-make/lto-readonly-lib/lib.rs b/src/test/run-make-fulldeps/lto-readonly-lib/lib.rs
similarity index 100%
rename from src/test/run-make/lto-readonly-lib/lib.rs
rename to src/test/run-make-fulldeps/lto-readonly-lib/lib.rs
diff --git a/src/test/run-make/lto-readonly-lib/main.rs b/src/test/run-make-fulldeps/lto-readonly-lib/main.rs
similarity index 100%
rename from src/test/run-make/lto-readonly-lib/main.rs
rename to src/test/run-make-fulldeps/lto-readonly-lib/main.rs
diff --git a/src/test/run-make/lto-smoke-c/Makefile b/src/test/run-make-fulldeps/lto-smoke-c/Makefile
similarity index 100%
rename from src/test/run-make/lto-smoke-c/Makefile
rename to src/test/run-make-fulldeps/lto-smoke-c/Makefile
diff --git a/src/test/run-make/lto-smoke-c/bar.c b/src/test/run-make-fulldeps/lto-smoke-c/bar.c
similarity index 100%
rename from src/test/run-make/lto-smoke-c/bar.c
rename to src/test/run-make-fulldeps/lto-smoke-c/bar.c
diff --git a/src/test/run-make/lto-smoke-c/foo.rs b/src/test/run-make-fulldeps/lto-smoke-c/foo.rs
similarity index 100%
rename from src/test/run-make/lto-smoke-c/foo.rs
rename to src/test/run-make-fulldeps/lto-smoke-c/foo.rs
diff --git a/src/test/run-make/lto-smoke/Makefile b/src/test/run-make-fulldeps/lto-smoke/Makefile
similarity index 100%
rename from src/test/run-make/lto-smoke/Makefile
rename to src/test/run-make-fulldeps/lto-smoke/Makefile
diff --git a/src/test/run-make/lto-smoke/lib.rs b/src/test/run-make-fulldeps/lto-smoke/lib.rs
similarity index 100%
rename from src/test/run-make/lto-smoke/lib.rs
rename to src/test/run-make-fulldeps/lto-smoke/lib.rs
diff --git a/src/test/run-make/lto-smoke/main.rs b/src/test/run-make-fulldeps/lto-smoke/main.rs
similarity index 100%
rename from src/test/run-make/lto-smoke/main.rs
rename to src/test/run-make-fulldeps/lto-smoke/main.rs
diff --git a/src/test/run-make/manual-crate-name/Makefile b/src/test/run-make-fulldeps/manual-crate-name/Makefile
similarity index 100%
rename from src/test/run-make/manual-crate-name/Makefile
rename to src/test/run-make-fulldeps/manual-crate-name/Makefile
diff --git a/src/test/run-make/manual-crate-name/bar.rs b/src/test/run-make-fulldeps/manual-crate-name/bar.rs
similarity index 100%
rename from src/test/run-make/manual-crate-name/bar.rs
rename to src/test/run-make-fulldeps/manual-crate-name/bar.rs
diff --git a/src/test/run-make/manual-link/Makefile b/src/test/run-make-fulldeps/manual-link/Makefile
similarity index 100%
rename from src/test/run-make/manual-link/Makefile
rename to src/test/run-make-fulldeps/manual-link/Makefile
diff --git a/src/test/run-make/manual-link/bar.c b/src/test/run-make-fulldeps/manual-link/bar.c
similarity index 100%
rename from src/test/run-make/manual-link/bar.c
rename to src/test/run-make-fulldeps/manual-link/bar.c
diff --git a/src/test/run-make/manual-link/foo.c b/src/test/run-make-fulldeps/manual-link/foo.c
similarity index 100%
rename from src/test/run-make/manual-link/foo.c
rename to src/test/run-make-fulldeps/manual-link/foo.c
diff --git a/src/test/run-make/manual-link/foo.rs b/src/test/run-make-fulldeps/manual-link/foo.rs
similarity index 100%
rename from src/test/run-make/manual-link/foo.rs
rename to src/test/run-make-fulldeps/manual-link/foo.rs
diff --git a/src/test/run-make/manual-link/main.rs b/src/test/run-make-fulldeps/manual-link/main.rs
similarity index 100%
rename from src/test/run-make/manual-link/main.rs
rename to src/test/run-make-fulldeps/manual-link/main.rs
diff --git a/src/test/run-make/many-crates-but-no-match/Makefile b/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/Makefile
rename to src/test/run-make-fulldeps/many-crates-but-no-match/Makefile
diff --git a/src/test/run-make/many-crates-but-no-match/crateA1.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/crateA1.rs
rename to src/test/run-make-fulldeps/many-crates-but-no-match/crateA1.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateA2.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/crateA2.rs
rename to src/test/run-make-fulldeps/many-crates-but-no-match/crateA2.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateA3.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/crateA3.rs
rename to src/test/run-make-fulldeps/many-crates-but-no-match/crateA3.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateB.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/crateB.rs
rename to src/test/run-make-fulldeps/many-crates-but-no-match/crateB.rs
diff --git a/src/test/run-make/many-crates-but-no-match/crateC.rs b/src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs
similarity index 100%
rename from src/test/run-make/many-crates-but-no-match/crateC.rs
rename to src/test/run-make-fulldeps/many-crates-but-no-match/crateC.rs
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/Makefile b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
similarity index 100%
rename from src/test/run-make/metadata-flag-frobs-symbols/Makefile
rename to src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/bar.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
similarity index 100%
rename from src/test/run-make/metadata-flag-frobs-symbols/bar.rs
rename to src/test/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs
diff --git a/src/test/run-make/metadata-flag-frobs-symbols/foo.rs b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
similarity index 100%
rename from src/test/run-make/metadata-flag-frobs-symbols/foo.rs
rename to src/test/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs
diff --git a/src/test/run-make/min-global-align/Makefile b/src/test/run-make-fulldeps/min-global-align/Makefile
similarity index 100%
rename from src/test/run-make/min-global-align/Makefile
rename to src/test/run-make-fulldeps/min-global-align/Makefile
diff --git a/src/test/run-make/min-global-align/min_global_align.rs b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
similarity index 100%
rename from src/test/run-make/min-global-align/min_global_align.rs
rename to src/test/run-make-fulldeps/min-global-align/min_global_align.rs
diff --git a/src/test/run-make/mismatching-target-triples/Makefile b/src/test/run-make-fulldeps/mismatching-target-triples/Makefile
similarity index 100%
rename from src/test/run-make/mismatching-target-triples/Makefile
rename to src/test/run-make-fulldeps/mismatching-target-triples/Makefile
diff --git a/src/test/run-make/mismatching-target-triples/bar.rs b/src/test/run-make-fulldeps/mismatching-target-triples/bar.rs
similarity index 100%
rename from src/test/run-make/mismatching-target-triples/bar.rs
rename to src/test/run-make-fulldeps/mismatching-target-triples/bar.rs
diff --git a/src/test/run-make/mismatching-target-triples/foo.rs b/src/test/run-make-fulldeps/mismatching-target-triples/foo.rs
similarity index 100%
rename from src/test/run-make/mismatching-target-triples/foo.rs
rename to src/test/run-make-fulldeps/mismatching-target-triples/foo.rs
diff --git a/src/test/run-make/missing-crate-dependency/Makefile b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile
similarity index 100%
rename from src/test/run-make/missing-crate-dependency/Makefile
rename to src/test/run-make-fulldeps/missing-crate-dependency/Makefile
diff --git a/src/test/run-make/missing-crate-dependency/crateA.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs
similarity index 100%
rename from src/test/run-make/missing-crate-dependency/crateA.rs
rename to src/test/run-make-fulldeps/missing-crate-dependency/crateA.rs
diff --git a/src/test/run-make/missing-crate-dependency/crateB.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs
similarity index 100%
rename from src/test/run-make/missing-crate-dependency/crateB.rs
rename to src/test/run-make-fulldeps/missing-crate-dependency/crateB.rs
diff --git a/src/test/run-make/missing-crate-dependency/crateC.rs b/src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs
similarity index 100%
rename from src/test/run-make/missing-crate-dependency/crateC.rs
rename to src/test/run-make-fulldeps/missing-crate-dependency/crateC.rs
diff --git a/src/test/run-make/mixing-deps/Makefile b/src/test/run-make-fulldeps/mixing-deps/Makefile
similarity index 100%
rename from src/test/run-make/mixing-deps/Makefile
rename to src/test/run-make-fulldeps/mixing-deps/Makefile
diff --git a/src/test/run-make/mixing-deps/both.rs b/src/test/run-make-fulldeps/mixing-deps/both.rs
similarity index 100%
rename from src/test/run-make/mixing-deps/both.rs
rename to src/test/run-make-fulldeps/mixing-deps/both.rs
diff --git a/src/test/run-make/mixing-deps/dylib.rs b/src/test/run-make-fulldeps/mixing-deps/dylib.rs
similarity index 100%
rename from src/test/run-make/mixing-deps/dylib.rs
rename to src/test/run-make-fulldeps/mixing-deps/dylib.rs
diff --git a/src/test/run-make/mixing-deps/prog.rs b/src/test/run-make-fulldeps/mixing-deps/prog.rs
similarity index 100%
rename from src/test/run-make/mixing-deps/prog.rs
rename to src/test/run-make-fulldeps/mixing-deps/prog.rs
diff --git a/src/test/run-make/mixing-formats/Makefile b/src/test/run-make-fulldeps/mixing-formats/Makefile
similarity index 100%
rename from src/test/run-make/mixing-formats/Makefile
rename to src/test/run-make-fulldeps/mixing-formats/Makefile
diff --git a/src/test/run-make/mixing-formats/bar1.rs b/src/test/run-make-fulldeps/mixing-formats/bar1.rs
similarity index 100%
rename from src/test/run-make/mixing-formats/bar1.rs
rename to src/test/run-make-fulldeps/mixing-formats/bar1.rs
diff --git a/src/test/run-make/mixing-formats/bar2.rs b/src/test/run-make-fulldeps/mixing-formats/bar2.rs
similarity index 100%
rename from src/test/run-make/mixing-formats/bar2.rs
rename to src/test/run-make-fulldeps/mixing-formats/bar2.rs
diff --git a/src/test/run-make/mixing-formats/baz.rs b/src/test/run-make-fulldeps/mixing-formats/baz.rs
similarity index 100%
rename from src/test/run-make/mixing-formats/baz.rs
rename to src/test/run-make-fulldeps/mixing-formats/baz.rs
diff --git a/src/test/run-make/mixing-formats/baz2.rs b/src/test/run-make-fulldeps/mixing-formats/baz2.rs
similarity index 100%
rename from src/test/run-make/mixing-formats/baz2.rs
rename to src/test/run-make-fulldeps/mixing-formats/baz2.rs
diff --git a/src/test/run-make/mixing-formats/foo.rs b/src/test/run-make-fulldeps/mixing-formats/foo.rs
similarity index 100%
rename from src/test/run-make/mixing-formats/foo.rs
rename to src/test/run-make-fulldeps/mixing-formats/foo.rs
diff --git a/src/test/run-make/mixing-libs/Makefile b/src/test/run-make-fulldeps/mixing-libs/Makefile
similarity index 100%
rename from src/test/run-make/mixing-libs/Makefile
rename to src/test/run-make-fulldeps/mixing-libs/Makefile
diff --git a/src/test/run-make/mixing-libs/dylib.rs b/src/test/run-make-fulldeps/mixing-libs/dylib.rs
similarity index 100%
rename from src/test/run-make/mixing-libs/dylib.rs
rename to src/test/run-make-fulldeps/mixing-libs/dylib.rs
diff --git a/src/test/run-make/mixing-libs/prog.rs b/src/test/run-make-fulldeps/mixing-libs/prog.rs
similarity index 100%
rename from src/test/run-make/mixing-libs/prog.rs
rename to src/test/run-make-fulldeps/mixing-libs/prog.rs
diff --git a/src/test/run-make/mixing-libs/rlib.rs b/src/test/run-make-fulldeps/mixing-libs/rlib.rs
similarity index 100%
rename from src/test/run-make/mixing-libs/rlib.rs
rename to src/test/run-make-fulldeps/mixing-libs/rlib.rs
diff --git a/src/test/run-make/msvc-opt-minsize/Makefile b/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile
similarity index 100%
rename from src/test/run-make/msvc-opt-minsize/Makefile
rename to src/test/run-make-fulldeps/msvc-opt-minsize/Makefile
diff --git a/src/test/run-make/msvc-opt-minsize/foo.rs b/src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs
similarity index 100%
rename from src/test/run-make/msvc-opt-minsize/foo.rs
rename to src/test/run-make-fulldeps/msvc-opt-minsize/foo.rs
diff --git a/src/test/run-make/multiple-emits/Makefile b/src/test/run-make-fulldeps/multiple-emits/Makefile
similarity index 100%
rename from src/test/run-make/multiple-emits/Makefile
rename to src/test/run-make-fulldeps/multiple-emits/Makefile
diff --git a/src/test/run-make/multiple-emits/foo.rs b/src/test/run-make-fulldeps/multiple-emits/foo.rs
similarity index 100%
rename from src/test/run-make/multiple-emits/foo.rs
rename to src/test/run-make-fulldeps/multiple-emits/foo.rs
diff --git a/src/test/run-make/no-builtins-lto/Makefile b/src/test/run-make-fulldeps/no-builtins-lto/Makefile
similarity index 100%
rename from src/test/run-make/no-builtins-lto/Makefile
rename to src/test/run-make-fulldeps/no-builtins-lto/Makefile
diff --git a/src/test/run-make/no-builtins-lto/main.rs b/src/test/run-make-fulldeps/no-builtins-lto/main.rs
similarity index 100%
rename from src/test/run-make/no-builtins-lto/main.rs
rename to src/test/run-make-fulldeps/no-builtins-lto/main.rs
diff --git a/src/test/run-make/no-builtins-lto/no_builtins.rs b/src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs
similarity index 100%
rename from src/test/run-make/no-builtins-lto/no_builtins.rs
rename to src/test/run-make-fulldeps/no-builtins-lto/no_builtins.rs
diff --git a/src/test/run-make/no-duplicate-libs/Makefile b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile
similarity index 100%
rename from src/test/run-make/no-duplicate-libs/Makefile
rename to src/test/run-make-fulldeps/no-duplicate-libs/Makefile
diff --git a/src/test/run-make/no-duplicate-libs/bar.c b/src/test/run-make-fulldeps/no-duplicate-libs/bar.c
similarity index 100%
rename from src/test/run-make/no-duplicate-libs/bar.c
rename to src/test/run-make-fulldeps/no-duplicate-libs/bar.c
diff --git a/src/test/run-make/no-duplicate-libs/foo.c b/src/test/run-make-fulldeps/no-duplicate-libs/foo.c
similarity index 100%
rename from src/test/run-make/no-duplicate-libs/foo.c
rename to src/test/run-make-fulldeps/no-duplicate-libs/foo.c
diff --git a/src/test/run-make/no-duplicate-libs/main.rs b/src/test/run-make-fulldeps/no-duplicate-libs/main.rs
similarity index 100%
rename from src/test/run-make/no-duplicate-libs/main.rs
rename to src/test/run-make-fulldeps/no-duplicate-libs/main.rs
diff --git a/src/test/run-make/no-integrated-as/Makefile b/src/test/run-make-fulldeps/no-integrated-as/Makefile
similarity index 100%
rename from src/test/run-make/no-integrated-as/Makefile
rename to src/test/run-make-fulldeps/no-integrated-as/Makefile
diff --git a/src/test/run-make/no-integrated-as/hello.rs b/src/test/run-make-fulldeps/no-integrated-as/hello.rs
similarity index 100%
rename from src/test/run-make/no-integrated-as/hello.rs
rename to src/test/run-make-fulldeps/no-integrated-as/hello.rs
diff --git a/src/test/run-make/no-intermediate-extras/Makefile b/src/test/run-make-fulldeps/no-intermediate-extras/Makefile
similarity index 100%
rename from src/test/run-make/no-intermediate-extras/Makefile
rename to src/test/run-make-fulldeps/no-intermediate-extras/Makefile
diff --git a/src/test/run-make/no-intermediate-extras/foo.rs b/src/test/run-make-fulldeps/no-intermediate-extras/foo.rs
similarity index 100%
rename from src/test/run-make/no-intermediate-extras/foo.rs
rename to src/test/run-make-fulldeps/no-intermediate-extras/foo.rs
diff --git a/src/test/run-make/obey-crate-type-flag/Makefile b/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile
similarity index 100%
rename from src/test/run-make/obey-crate-type-flag/Makefile
rename to src/test/run-make-fulldeps/obey-crate-type-flag/Makefile
diff --git a/src/test/run-make/obey-crate-type-flag/test.rs b/src/test/run-make-fulldeps/obey-crate-type-flag/test.rs
similarity index 100%
rename from src/test/run-make/obey-crate-type-flag/test.rs
rename to src/test/run-make-fulldeps/obey-crate-type-flag/test.rs
diff --git a/src/test/run-make/output-filename-conflicts-with-directory/Makefile b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
similarity index 100%
rename from src/test/run-make/output-filename-conflicts-with-directory/Makefile
rename to src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile
diff --git a/src/test/run-make/output-filename-conflicts-with-directory/foo.rs b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
similarity index 100%
rename from src/test/run-make/output-filename-conflicts-with-directory/foo.rs
rename to src/test/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs
diff --git a/src/test/run-make/output-filename-overwrites-input/Makefile b/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile
similarity index 100%
rename from src/test/run-make/output-filename-overwrites-input/Makefile
rename to src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile
diff --git a/src/test/run-make/output-filename-overwrites-input/bar.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs
similarity index 100%
rename from src/test/run-make/output-filename-overwrites-input/bar.rs
rename to src/test/run-make-fulldeps/output-filename-overwrites-input/bar.rs
diff --git a/src/test/run-make/output-filename-overwrites-input/foo.rs b/src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs
similarity index 100%
rename from src/test/run-make/output-filename-overwrites-input/foo.rs
rename to src/test/run-make-fulldeps/output-filename-overwrites-input/foo.rs
diff --git a/src/test/run-make/output-type-permutations/Makefile b/src/test/run-make-fulldeps/output-type-permutations/Makefile
similarity index 100%
rename from src/test/run-make/output-type-permutations/Makefile
rename to src/test/run-make-fulldeps/output-type-permutations/Makefile
diff --git a/src/test/run-make/output-type-permutations/foo.rs b/src/test/run-make-fulldeps/output-type-permutations/foo.rs
similarity index 100%
rename from src/test/run-make/output-type-permutations/foo.rs
rename to src/test/run-make-fulldeps/output-type-permutations/foo.rs
diff --git a/src/test/run-make/output-with-hyphens/Makefile b/src/test/run-make-fulldeps/output-with-hyphens/Makefile
similarity index 100%
rename from src/test/run-make/output-with-hyphens/Makefile
rename to src/test/run-make-fulldeps/output-with-hyphens/Makefile
diff --git a/src/test/run-make/output-with-hyphens/foo-bar.rs b/src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs
similarity index 100%
rename from src/test/run-make/output-with-hyphens/foo-bar.rs
rename to src/test/run-make-fulldeps/output-with-hyphens/foo-bar.rs
diff --git a/src/test/run-make/prefer-dylib/Makefile b/src/test/run-make-fulldeps/prefer-dylib/Makefile
similarity index 100%
rename from src/test/run-make/prefer-dylib/Makefile
rename to src/test/run-make-fulldeps/prefer-dylib/Makefile
diff --git a/src/test/run-make/prefer-dylib/bar.rs b/src/test/run-make-fulldeps/prefer-dylib/bar.rs
similarity index 100%
rename from src/test/run-make/prefer-dylib/bar.rs
rename to src/test/run-make-fulldeps/prefer-dylib/bar.rs
diff --git a/src/test/run-make/prefer-dylib/foo.rs b/src/test/run-make-fulldeps/prefer-dylib/foo.rs
similarity index 100%
rename from src/test/run-make/prefer-dylib/foo.rs
rename to src/test/run-make-fulldeps/prefer-dylib/foo.rs
diff --git a/src/test/run-make/prefer-rlib/Makefile b/src/test/run-make-fulldeps/prefer-rlib/Makefile
similarity index 100%
rename from src/test/run-make/prefer-rlib/Makefile
rename to src/test/run-make-fulldeps/prefer-rlib/Makefile
diff --git a/src/test/run-make/prefer-rlib/bar.rs b/src/test/run-make-fulldeps/prefer-rlib/bar.rs
similarity index 100%
rename from src/test/run-make/prefer-rlib/bar.rs
rename to src/test/run-make-fulldeps/prefer-rlib/bar.rs
diff --git a/src/test/run-make/prefer-rlib/foo.rs b/src/test/run-make-fulldeps/prefer-rlib/foo.rs
similarity index 100%
rename from src/test/run-make/prefer-rlib/foo.rs
rename to src/test/run-make-fulldeps/prefer-rlib/foo.rs
diff --git a/src/test/run-make/pretty-expanded-hygiene/Makefile b/src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
similarity index 100%
rename from src/test/run-make/pretty-expanded-hygiene/Makefile
rename to src/test/run-make-fulldeps/pretty-expanded-hygiene/Makefile
diff --git a/src/test/run-make/pretty-expanded-hygiene/input.pp.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
similarity index 100%
rename from src/test/run-make/pretty-expanded-hygiene/input.pp.rs
rename to src/test/run-make-fulldeps/pretty-expanded-hygiene/input.pp.rs
diff --git a/src/test/run-make/pretty-expanded-hygiene/input.rs b/src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
similarity index 100%
rename from src/test/run-make/pretty-expanded-hygiene/input.rs
rename to src/test/run-make-fulldeps/pretty-expanded-hygiene/input.rs
diff --git a/src/test/run-make/pretty-expanded/Makefile b/src/test/run-make-fulldeps/pretty-expanded/Makefile
similarity index 100%
rename from src/test/run-make/pretty-expanded/Makefile
rename to src/test/run-make-fulldeps/pretty-expanded/Makefile
diff --git a/src/test/run-make/pretty-expanded/input.rs b/src/test/run-make-fulldeps/pretty-expanded/input.rs
similarity index 100%
rename from src/test/run-make/pretty-expanded/input.rs
rename to src/test/run-make-fulldeps/pretty-expanded/input.rs
diff --git a/src/test/run-make/pretty-print-path-suffix/Makefile b/src/test/run-make-fulldeps/pretty-print-path-suffix/Makefile
similarity index 100%
rename from src/test/run-make/pretty-print-path-suffix/Makefile
rename to src/test/run-make-fulldeps/pretty-print-path-suffix/Makefile
diff --git a/src/test/run-make/pretty-print-path-suffix/foo.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo.pp
similarity index 100%
rename from src/test/run-make/pretty-print-path-suffix/foo.pp
rename to src/test/run-make-fulldeps/pretty-print-path-suffix/foo.pp
diff --git a/src/test/run-make/pretty-print-path-suffix/foo_method.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/foo_method.pp
similarity index 100%
rename from src/test/run-make/pretty-print-path-suffix/foo_method.pp
rename to src/test/run-make-fulldeps/pretty-print-path-suffix/foo_method.pp
diff --git a/src/test/run-make/pretty-print-path-suffix/input.rs b/src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs
similarity index 100%
rename from src/test/run-make/pretty-print-path-suffix/input.rs
rename to src/test/run-make-fulldeps/pretty-print-path-suffix/input.rs
diff --git a/src/test/run-make/pretty-print-path-suffix/nest_foo.pp b/src/test/run-make-fulldeps/pretty-print-path-suffix/nest_foo.pp
similarity index 100%
rename from src/test/run-make/pretty-print-path-suffix/nest_foo.pp
rename to src/test/run-make-fulldeps/pretty-print-path-suffix/nest_foo.pp
diff --git a/src/test/run-make/pretty-print-to-file/Makefile b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile
similarity index 100%
rename from src/test/run-make/pretty-print-to-file/Makefile
rename to src/test/run-make-fulldeps/pretty-print-to-file/Makefile
diff --git a/src/test/run-make/pretty-print-to-file/input.pp b/src/test/run-make-fulldeps/pretty-print-to-file/input.pp
similarity index 100%
rename from src/test/run-make/pretty-print-to-file/input.pp
rename to src/test/run-make-fulldeps/pretty-print-to-file/input.pp
diff --git a/src/test/run-make/pretty-print-to-file/input.rs b/src/test/run-make-fulldeps/pretty-print-to-file/input.rs
similarity index 100%
rename from src/test/run-make/pretty-print-to-file/input.rs
rename to src/test/run-make-fulldeps/pretty-print-to-file/input.rs
diff --git a/src/test/run-make/print-cfg/Makefile b/src/test/run-make-fulldeps/print-cfg/Makefile
similarity index 100%
rename from src/test/run-make/print-cfg/Makefile
rename to src/test/run-make-fulldeps/print-cfg/Makefile
diff --git a/src/test/run-make/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile
similarity index 100%
rename from src/test/run-make/print-target-list/Makefile
rename to src/test/run-make-fulldeps/print-target-list/Makefile
diff --git a/src/test/run-make/profile/Makefile b/src/test/run-make-fulldeps/profile/Makefile
similarity index 100%
rename from src/test/run-make/profile/Makefile
rename to src/test/run-make-fulldeps/profile/Makefile
diff --git a/src/test/run-make/profile/test.rs b/src/test/run-make-fulldeps/profile/test.rs
similarity index 100%
rename from src/test/run-make/profile/test.rs
rename to src/test/run-make-fulldeps/profile/test.rs
diff --git a/src/test/run-make/prune-link-args/Makefile b/src/test/run-make-fulldeps/prune-link-args/Makefile
similarity index 100%
rename from src/test/run-make/prune-link-args/Makefile
rename to src/test/run-make-fulldeps/prune-link-args/Makefile
diff --git a/src/test/run-make/prune-link-args/empty.rs b/src/test/run-make-fulldeps/prune-link-args/empty.rs
similarity index 100%
rename from src/test/run-make/prune-link-args/empty.rs
rename to src/test/run-make-fulldeps/prune-link-args/empty.rs
diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make-fulldeps/relocation-model/Makefile
similarity index 100%
rename from src/test/run-make/relocation-model/Makefile
rename to src/test/run-make-fulldeps/relocation-model/Makefile
diff --git a/src/test/run-make/relocation-model/foo.rs b/src/test/run-make-fulldeps/relocation-model/foo.rs
similarity index 100%
rename from src/test/run-make/relocation-model/foo.rs
rename to src/test/run-make-fulldeps/relocation-model/foo.rs
diff --git a/src/test/run-make/relro-levels/Makefile b/src/test/run-make-fulldeps/relro-levels/Makefile
similarity index 100%
rename from src/test/run-make/relro-levels/Makefile
rename to src/test/run-make-fulldeps/relro-levels/Makefile
diff --git a/src/test/run-make/relro-levels/hello.rs b/src/test/run-make-fulldeps/relro-levels/hello.rs
similarity index 100%
rename from src/test/run-make/relro-levels/hello.rs
rename to src/test/run-make-fulldeps/relro-levels/hello.rs
diff --git a/src/test/run-make/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile
similarity index 100%
rename from src/test/run-make/reproducible-build/Makefile
rename to src/test/run-make-fulldeps/reproducible-build/Makefile
diff --git a/src/test/run-make/reproducible-build/linker.rs b/src/test/run-make-fulldeps/reproducible-build/linker.rs
similarity index 100%
rename from src/test/run-make/reproducible-build/linker.rs
rename to src/test/run-make-fulldeps/reproducible-build/linker.rs
diff --git a/src/test/run-make/reproducible-build/reproducible-build-aux.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
similarity index 100%
rename from src/test/run-make/reproducible-build/reproducible-build-aux.rs
rename to src/test/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs
diff --git a/src/test/run-make/reproducible-build/reproducible-build.rs b/src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs
similarity index 100%
rename from src/test/run-make/reproducible-build/reproducible-build.rs
rename to src/test/run-make-fulldeps/reproducible-build/reproducible-build.rs
diff --git a/src/test/run-make/rlib-chain/Makefile b/src/test/run-make-fulldeps/rlib-chain/Makefile
similarity index 100%
rename from src/test/run-make/rlib-chain/Makefile
rename to src/test/run-make-fulldeps/rlib-chain/Makefile
diff --git a/src/test/run-make/rlib-chain/m1.rs b/src/test/run-make-fulldeps/rlib-chain/m1.rs
similarity index 100%
rename from src/test/run-make/rlib-chain/m1.rs
rename to src/test/run-make-fulldeps/rlib-chain/m1.rs
diff --git a/src/test/run-make/rlib-chain/m2.rs b/src/test/run-make-fulldeps/rlib-chain/m2.rs
similarity index 100%
rename from src/test/run-make/rlib-chain/m2.rs
rename to src/test/run-make-fulldeps/rlib-chain/m2.rs
diff --git a/src/test/run-make/rlib-chain/m3.rs b/src/test/run-make-fulldeps/rlib-chain/m3.rs
similarity index 100%
rename from src/test/run-make/rlib-chain/m3.rs
rename to src/test/run-make-fulldeps/rlib-chain/m3.rs
diff --git a/src/test/run-make/rlib-chain/m4.rs b/src/test/run-make-fulldeps/rlib-chain/m4.rs
similarity index 100%
rename from src/test/run-make/rlib-chain/m4.rs
rename to src/test/run-make-fulldeps/rlib-chain/m4.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile
similarity index 100%
rename from src/test/run-make/rustc-macro-dep-files/Makefile
rename to src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile
diff --git a/src/test/run-make/rustc-macro-dep-files/bar.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs
similarity index 100%
rename from src/test/run-make/rustc-macro-dep-files/bar.rs
rename to src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs
diff --git a/src/test/run-make/rustc-macro-dep-files/foo.rs b/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs
similarity index 100%
rename from src/test/run-make/rustc-macro-dep-files/foo.rs
rename to src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs
diff --git a/src/test/run-make/rustdoc-error-lines/Makefile b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
similarity index 100%
rename from src/test/run-make/rustdoc-error-lines/Makefile
rename to src/test/run-make-fulldeps/rustdoc-error-lines/Makefile
diff --git a/src/test/run-make/rustdoc-error-lines/input.rs b/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
similarity index 100%
rename from src/test/run-make/rustdoc-error-lines/input.rs
rename to src/test/run-make-fulldeps/rustdoc-error-lines/input.rs
diff --git a/src/test/run-make/rustdoc-output-path/Makefile b/src/test/run-make-fulldeps/rustdoc-output-path/Makefile
similarity index 100%
rename from src/test/run-make/rustdoc-output-path/Makefile
rename to src/test/run-make-fulldeps/rustdoc-output-path/Makefile
diff --git a/src/test/run-make/rustdoc-output-path/foo.rs b/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs
similarity index 100%
rename from src/test/run-make/rustdoc-output-path/foo.rs
rename to src/test/run-make-fulldeps/rustdoc-output-path/foo.rs
diff --git a/src/test/run-make/sanitizer-address/Makefile b/src/test/run-make-fulldeps/sanitizer-address/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-address/Makefile
rename to src/test/run-make-fulldeps/sanitizer-address/Makefile
diff --git a/src/test/run-make/sanitizer-address/overflow.rs b/src/test/run-make-fulldeps/sanitizer-address/overflow.rs
similarity index 100%
rename from src/test/run-make/sanitizer-address/overflow.rs
rename to src/test/run-make-fulldeps/sanitizer-address/overflow.rs
diff --git a/src/test/run-make/sanitizer-cdylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-cdylib-link/Makefile
rename to src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile
diff --git a/src/test/run-make/sanitizer-cdylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs
similarity index 100%
rename from src/test/run-make/sanitizer-cdylib-link/library.rs
rename to src/test/run-make-fulldeps/sanitizer-cdylib-link/library.rs
diff --git a/src/test/run-make/sanitizer-cdylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs
similarity index 100%
rename from src/test/run-make/sanitizer-cdylib-link/program.rs
rename to src/test/run-make-fulldeps/sanitizer-cdylib-link/program.rs
diff --git a/src/test/run-make/sanitizer-dylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-dylib-link/Makefile
rename to src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile
diff --git a/src/test/run-make/sanitizer-dylib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs
similarity index 100%
rename from src/test/run-make/sanitizer-dylib-link/library.rs
rename to src/test/run-make-fulldeps/sanitizer-dylib-link/library.rs
diff --git a/src/test/run-make/sanitizer-dylib-link/program.rs b/src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs
similarity index 100%
rename from src/test/run-make/sanitizer-dylib-link/program.rs
rename to src/test/run-make-fulldeps/sanitizer-dylib-link/program.rs
diff --git a/src/test/run-make/sanitizer-invalid-cratetype/Makefile b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-invalid-cratetype/Makefile
rename to src/test/run-make-fulldeps/sanitizer-invalid-cratetype/Makefile
diff --git a/src/test/run-make/sanitizer-invalid-cratetype/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs
similarity index 100%
rename from src/test/run-make/sanitizer-invalid-cratetype/hello.rs
rename to src/test/run-make-fulldeps/sanitizer-invalid-cratetype/hello.rs
diff --git a/src/test/run-make/sanitizer-invalid-target/Makefile b/src/test/run-make-fulldeps/sanitizer-invalid-target/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-invalid-target/Makefile
rename to src/test/run-make-fulldeps/sanitizer-invalid-target/Makefile
diff --git a/src/test/run-make/sanitizer-invalid-target/hello.rs b/src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs
similarity index 100%
rename from src/test/run-make/sanitizer-invalid-target/hello.rs
rename to src/test/run-make-fulldeps/sanitizer-invalid-target/hello.rs
diff --git a/src/test/run-make/sanitizer-leak/Makefile b/src/test/run-make-fulldeps/sanitizer-leak/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-leak/Makefile
rename to src/test/run-make-fulldeps/sanitizer-leak/Makefile
diff --git a/src/test/run-make/sanitizer-leak/leak.rs b/src/test/run-make-fulldeps/sanitizer-leak/leak.rs
similarity index 100%
rename from src/test/run-make/sanitizer-leak/leak.rs
rename to src/test/run-make-fulldeps/sanitizer-leak/leak.rs
diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make-fulldeps/sanitizer-memory/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-memory/Makefile
rename to src/test/run-make-fulldeps/sanitizer-memory/Makefile
diff --git a/src/test/run-make/sanitizer-memory/uninit.rs b/src/test/run-make-fulldeps/sanitizer-memory/uninit.rs
similarity index 100%
rename from src/test/run-make/sanitizer-memory/uninit.rs
rename to src/test/run-make-fulldeps/sanitizer-memory/uninit.rs
diff --git a/src/test/run-make/sanitizer-staticlib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
similarity index 100%
rename from src/test/run-make/sanitizer-staticlib-link/Makefile
rename to src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile
diff --git a/src/test/run-make/sanitizer-staticlib-link/library.rs b/src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs
similarity index 100%
rename from src/test/run-make/sanitizer-staticlib-link/library.rs
rename to src/test/run-make-fulldeps/sanitizer-staticlib-link/library.rs
diff --git a/src/test/run-make/sanitizer-staticlib-link/program.c b/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c
similarity index 100%
rename from src/test/run-make/sanitizer-staticlib-link/program.c
rename to src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c
diff --git a/src/test/run-make/save-analysis-fail/Makefile b/src/test/run-make-fulldeps/save-analysis-fail/Makefile
similarity index 100%
rename from src/test/run-make/save-analysis-fail/Makefile
rename to src/test/run-make-fulldeps/save-analysis-fail/Makefile
diff --git a/src/test/run-make/save-analysis-fail/SameDir.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs
similarity index 100%
rename from src/test/run-make/save-analysis-fail/SameDir.rs
rename to src/test/run-make-fulldeps/save-analysis-fail/SameDir.rs
diff --git a/src/test/run-make/save-analysis-fail/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs
similarity index 100%
rename from src/test/run-make/save-analysis-fail/SameDir3.rs
rename to src/test/run-make-fulldeps/save-analysis-fail/SameDir3.rs
diff --git a/src/test/run-make/save-analysis-fail/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
similarity index 100%
rename from src/test/run-make/save-analysis-fail/SubDir/mod.rs
rename to src/test/run-make-fulldeps/save-analysis-fail/SubDir/mod.rs
diff --git a/src/test/run-make/save-analysis-fail/foo.rs b/src/test/run-make-fulldeps/save-analysis-fail/foo.rs
similarity index 100%
rename from src/test/run-make/save-analysis-fail/foo.rs
rename to src/test/run-make-fulldeps/save-analysis-fail/foo.rs
diff --git a/src/test/run-make/save-analysis-fail/krate2.rs b/src/test/run-make-fulldeps/save-analysis-fail/krate2.rs
similarity index 100%
rename from src/test/run-make/save-analysis-fail/krate2.rs
rename to src/test/run-make-fulldeps/save-analysis-fail/krate2.rs
diff --git a/src/test/run-make/save-analysis/Makefile b/src/test/run-make-fulldeps/save-analysis/Makefile
similarity index 100%
rename from src/test/run-make/save-analysis/Makefile
rename to src/test/run-make-fulldeps/save-analysis/Makefile
diff --git a/src/test/run-make/save-analysis/SameDir.rs b/src/test/run-make-fulldeps/save-analysis/SameDir.rs
similarity index 100%
rename from src/test/run-make/save-analysis/SameDir.rs
rename to src/test/run-make-fulldeps/save-analysis/SameDir.rs
diff --git a/src/test/run-make/save-analysis/SameDir3.rs b/src/test/run-make-fulldeps/save-analysis/SameDir3.rs
similarity index 100%
rename from src/test/run-make/save-analysis/SameDir3.rs
rename to src/test/run-make-fulldeps/save-analysis/SameDir3.rs
diff --git a/src/test/run-make/save-analysis/SubDir/mod.rs b/src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs
similarity index 100%
rename from src/test/run-make/save-analysis/SubDir/mod.rs
rename to src/test/run-make-fulldeps/save-analysis/SubDir/mod.rs
diff --git a/src/test/run-make/save-analysis/extra-docs.md b/src/test/run-make-fulldeps/save-analysis/extra-docs.md
similarity index 100%
rename from src/test/run-make/save-analysis/extra-docs.md
rename to src/test/run-make-fulldeps/save-analysis/extra-docs.md
diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make-fulldeps/save-analysis/foo.rs
similarity index 100%
rename from src/test/run-make/save-analysis/foo.rs
rename to src/test/run-make-fulldeps/save-analysis/foo.rs
diff --git a/src/test/run-make/save-analysis/krate2.rs b/src/test/run-make-fulldeps/save-analysis/krate2.rs
similarity index 100%
rename from src/test/run-make/save-analysis/krate2.rs
rename to src/test/run-make-fulldeps/save-analysis/krate2.rs
diff --git a/src/test/run-make/sepcomp-cci-copies/Makefile b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
similarity index 100%
rename from src/test/run-make/sepcomp-cci-copies/Makefile
rename to src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile
diff --git a/src/test/run-make/sepcomp-cci-copies/cci_lib.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
similarity index 100%
rename from src/test/run-make/sepcomp-cci-copies/cci_lib.rs
rename to src/test/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs
diff --git a/src/test/run-make/sepcomp-cci-copies/foo.rs b/src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs
similarity index 100%
rename from src/test/run-make/sepcomp-cci-copies/foo.rs
rename to src/test/run-make-fulldeps/sepcomp-cci-copies/foo.rs
diff --git a/src/test/run-make/sepcomp-inlining/Makefile b/src/test/run-make-fulldeps/sepcomp-inlining/Makefile
similarity index 100%
rename from src/test/run-make/sepcomp-inlining/Makefile
rename to src/test/run-make-fulldeps/sepcomp-inlining/Makefile
diff --git a/src/test/run-make/sepcomp-inlining/foo.rs b/src/test/run-make-fulldeps/sepcomp-inlining/foo.rs
similarity index 100%
rename from src/test/run-make/sepcomp-inlining/foo.rs
rename to src/test/run-make-fulldeps/sepcomp-inlining/foo.rs
diff --git a/src/test/run-make/sepcomp-separate/Makefile b/src/test/run-make-fulldeps/sepcomp-separate/Makefile
similarity index 100%
rename from src/test/run-make/sepcomp-separate/Makefile
rename to src/test/run-make-fulldeps/sepcomp-separate/Makefile
diff --git a/src/test/run-make/sepcomp-separate/foo.rs b/src/test/run-make-fulldeps/sepcomp-separate/foo.rs
similarity index 100%
rename from src/test/run-make/sepcomp-separate/foo.rs
rename to src/test/run-make-fulldeps/sepcomp-separate/foo.rs
diff --git a/src/test/run-make/simd-ffi/Makefile b/src/test/run-make-fulldeps/simd-ffi/Makefile
similarity index 100%
rename from src/test/run-make/simd-ffi/Makefile
rename to src/test/run-make-fulldeps/simd-ffi/Makefile
diff --git a/src/test/run-make/simd-ffi/simd.rs b/src/test/run-make-fulldeps/simd-ffi/simd.rs
similarity index 100%
rename from src/test/run-make/simd-ffi/simd.rs
rename to src/test/run-make-fulldeps/simd-ffi/simd.rs
diff --git a/src/test/run-make/simple-dylib/Makefile b/src/test/run-make-fulldeps/simple-dylib/Makefile
similarity index 100%
rename from src/test/run-make/simple-dylib/Makefile
rename to src/test/run-make-fulldeps/simple-dylib/Makefile
diff --git a/src/test/run-make/simple-dylib/bar.rs b/src/test/run-make-fulldeps/simple-dylib/bar.rs
similarity index 100%
rename from src/test/run-make/simple-dylib/bar.rs
rename to src/test/run-make-fulldeps/simple-dylib/bar.rs
diff --git a/src/test/run-make/simple-dylib/foo.rs b/src/test/run-make-fulldeps/simple-dylib/foo.rs
similarity index 100%
rename from src/test/run-make/simple-dylib/foo.rs
rename to src/test/run-make-fulldeps/simple-dylib/foo.rs
diff --git a/src/test/run-make/simple-rlib/Makefile b/src/test/run-make-fulldeps/simple-rlib/Makefile
similarity index 100%
rename from src/test/run-make/simple-rlib/Makefile
rename to src/test/run-make-fulldeps/simple-rlib/Makefile
diff --git a/src/test/run-make/simple-rlib/bar.rs b/src/test/run-make-fulldeps/simple-rlib/bar.rs
similarity index 100%
rename from src/test/run-make/simple-rlib/bar.rs
rename to src/test/run-make-fulldeps/simple-rlib/bar.rs
diff --git a/src/test/run-make/simple-rlib/foo.rs b/src/test/run-make-fulldeps/simple-rlib/foo.rs
similarity index 100%
rename from src/test/run-make/simple-rlib/foo.rs
rename to src/test/run-make-fulldeps/simple-rlib/foo.rs
diff --git a/src/test/run-make/stable-symbol-names/Makefile b/src/test/run-make-fulldeps/stable-symbol-names/Makefile
similarity index 100%
rename from src/test/run-make/stable-symbol-names/Makefile
rename to src/test/run-make-fulldeps/stable-symbol-names/Makefile
diff --git a/src/test/run-make/stable-symbol-names/stable-symbol-names1.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
similarity index 100%
rename from src/test/run-make/stable-symbol-names/stable-symbol-names1.rs
rename to src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs
diff --git a/src/test/run-make/stable-symbol-names/stable-symbol-names2.rs b/src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
similarity index 100%
rename from src/test/run-make/stable-symbol-names/stable-symbol-names2.rs
rename to src/test/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs
diff --git a/src/test/run-make/static-dylib-by-default/Makefile b/src/test/run-make-fulldeps/static-dylib-by-default/Makefile
similarity index 100%
rename from src/test/run-make/static-dylib-by-default/Makefile
rename to src/test/run-make-fulldeps/static-dylib-by-default/Makefile
diff --git a/src/test/run-make/static-dylib-by-default/bar.rs b/src/test/run-make-fulldeps/static-dylib-by-default/bar.rs
similarity index 100%
rename from src/test/run-make/static-dylib-by-default/bar.rs
rename to src/test/run-make-fulldeps/static-dylib-by-default/bar.rs
diff --git a/src/test/run-make/static-dylib-by-default/foo.rs b/src/test/run-make-fulldeps/static-dylib-by-default/foo.rs
similarity index 100%
rename from src/test/run-make/static-dylib-by-default/foo.rs
rename to src/test/run-make-fulldeps/static-dylib-by-default/foo.rs
diff --git a/src/test/run-make/static-dylib-by-default/main.c b/src/test/run-make-fulldeps/static-dylib-by-default/main.c
similarity index 100%
rename from src/test/run-make/static-dylib-by-default/main.c
rename to src/test/run-make-fulldeps/static-dylib-by-default/main.c
diff --git a/src/test/run-make/static-nobundle/Makefile b/src/test/run-make-fulldeps/static-nobundle/Makefile
similarity index 100%
rename from src/test/run-make/static-nobundle/Makefile
rename to src/test/run-make-fulldeps/static-nobundle/Makefile
diff --git a/src/test/run-make/static-nobundle/aaa.c b/src/test/run-make-fulldeps/static-nobundle/aaa.c
similarity index 100%
rename from src/test/run-make/static-nobundle/aaa.c
rename to src/test/run-make-fulldeps/static-nobundle/aaa.c
diff --git a/src/test/run-make/static-nobundle/bbb.rs b/src/test/run-make-fulldeps/static-nobundle/bbb.rs
similarity index 100%
rename from src/test/run-make/static-nobundle/bbb.rs
rename to src/test/run-make-fulldeps/static-nobundle/bbb.rs
diff --git a/src/test/run-make/static-nobundle/ccc.rs b/src/test/run-make-fulldeps/static-nobundle/ccc.rs
similarity index 100%
rename from src/test/run-make/static-nobundle/ccc.rs
rename to src/test/run-make-fulldeps/static-nobundle/ccc.rs
diff --git a/src/test/run-make/static-nobundle/ddd.rs b/src/test/run-make-fulldeps/static-nobundle/ddd.rs
similarity index 100%
rename from src/test/run-make/static-nobundle/ddd.rs
rename to src/test/run-make-fulldeps/static-nobundle/ddd.rs
diff --git a/src/test/run-make/static-unwinding/Makefile b/src/test/run-make-fulldeps/static-unwinding/Makefile
similarity index 100%
rename from src/test/run-make/static-unwinding/Makefile
rename to src/test/run-make-fulldeps/static-unwinding/Makefile
diff --git a/src/test/run-make/static-unwinding/lib.rs b/src/test/run-make-fulldeps/static-unwinding/lib.rs
similarity index 100%
rename from src/test/run-make/static-unwinding/lib.rs
rename to src/test/run-make-fulldeps/static-unwinding/lib.rs
diff --git a/src/test/run-make/static-unwinding/main.rs b/src/test/run-make-fulldeps/static-unwinding/main.rs
similarity index 100%
rename from src/test/run-make/static-unwinding/main.rs
rename to src/test/run-make-fulldeps/static-unwinding/main.rs
diff --git a/src/test/run-make/staticlib-blank-lib/Makefile b/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile
similarity index 100%
rename from src/test/run-make/staticlib-blank-lib/Makefile
rename to src/test/run-make-fulldeps/staticlib-blank-lib/Makefile
diff --git a/src/test/run-make/staticlib-blank-lib/foo.rs b/src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs
similarity index 100%
rename from src/test/run-make/staticlib-blank-lib/foo.rs
rename to src/test/run-make-fulldeps/staticlib-blank-lib/foo.rs
diff --git a/src/test/run-make/stdin-non-utf8/Makefile b/src/test/run-make-fulldeps/stdin-non-utf8/Makefile
similarity index 100%
rename from src/test/run-make/stdin-non-utf8/Makefile
rename to src/test/run-make-fulldeps/stdin-non-utf8/Makefile
diff --git a/src/test/run-make/stdin-non-utf8/non-utf8 b/src/test/run-make-fulldeps/stdin-non-utf8/non-utf8
similarity index 100%
rename from src/test/run-make/stdin-non-utf8/non-utf8
rename to src/test/run-make-fulldeps/stdin-non-utf8/non-utf8
diff --git a/src/test/run-make/suspicious-library/Makefile b/src/test/run-make-fulldeps/suspicious-library/Makefile
similarity index 100%
rename from src/test/run-make/suspicious-library/Makefile
rename to src/test/run-make-fulldeps/suspicious-library/Makefile
diff --git a/src/test/run-make/suspicious-library/bar.rs b/src/test/run-make-fulldeps/suspicious-library/bar.rs
similarity index 100%
rename from src/test/run-make/suspicious-library/bar.rs
rename to src/test/run-make-fulldeps/suspicious-library/bar.rs
diff --git a/src/test/run-make/suspicious-library/foo.rs b/src/test/run-make-fulldeps/suspicious-library/foo.rs
similarity index 100%
rename from src/test/run-make/suspicious-library/foo.rs
rename to src/test/run-make-fulldeps/suspicious-library/foo.rs
diff --git a/src/test/run-make/symbol-visibility/Makefile b/src/test/run-make-fulldeps/symbol-visibility/Makefile
similarity index 100%
rename from src/test/run-make/symbol-visibility/Makefile
rename to src/test/run-make-fulldeps/symbol-visibility/Makefile
diff --git a/src/test/run-make/symbol-visibility/a_cdylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs
similarity index 100%
rename from src/test/run-make/symbol-visibility/a_cdylib.rs
rename to src/test/run-make-fulldeps/symbol-visibility/a_cdylib.rs
diff --git a/src/test/run-make/symbol-visibility/a_rust_dylib.rs b/src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
similarity index 100%
rename from src/test/run-make/symbol-visibility/a_rust_dylib.rs
rename to src/test/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs
diff --git a/src/test/run-make/symbol-visibility/an_executable.rs b/src/test/run-make-fulldeps/symbol-visibility/an_executable.rs
similarity index 100%
rename from src/test/run-make/symbol-visibility/an_executable.rs
rename to src/test/run-make-fulldeps/symbol-visibility/an_executable.rs
diff --git a/src/test/run-make/symbol-visibility/an_rlib.rs b/src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs
similarity index 100%
rename from src/test/run-make/symbol-visibility/an_rlib.rs
rename to src/test/run-make-fulldeps/symbol-visibility/an_rlib.rs
diff --git a/src/test/run-make/symbols-are-reasonable/Makefile b/src/test/run-make-fulldeps/symbols-are-reasonable/Makefile
similarity index 100%
rename from src/test/run-make/symbols-are-reasonable/Makefile
rename to src/test/run-make-fulldeps/symbols-are-reasonable/Makefile
diff --git a/src/test/run-make/symbols-are-reasonable/lib.rs b/src/test/run-make-fulldeps/symbols-are-reasonable/lib.rs
similarity index 100%
rename from src/test/run-make/symbols-are-reasonable/lib.rs
rename to src/test/run-make-fulldeps/symbols-are-reasonable/lib.rs
diff --git a/src/test/run-make/symbols-include-type-name/Makefile b/src/test/run-make-fulldeps/symbols-include-type-name/Makefile
similarity index 100%
rename from src/test/run-make/symbols-include-type-name/Makefile
rename to src/test/run-make-fulldeps/symbols-include-type-name/Makefile
diff --git a/src/test/run-make/symbols-include-type-name/lib.rs b/src/test/run-make-fulldeps/symbols-include-type-name/lib.rs
similarity index 100%
rename from src/test/run-make/symbols-include-type-name/lib.rs
rename to src/test/run-make-fulldeps/symbols-include-type-name/lib.rs
diff --git a/src/test/run-make/symlinked-extern/Makefile b/src/test/run-make-fulldeps/symlinked-extern/Makefile
similarity index 100%
rename from src/test/run-make/symlinked-extern/Makefile
rename to src/test/run-make-fulldeps/symlinked-extern/Makefile
diff --git a/src/test/run-make/symlinked-extern/bar.rs b/src/test/run-make-fulldeps/symlinked-extern/bar.rs
similarity index 100%
rename from src/test/run-make/symlinked-extern/bar.rs
rename to src/test/run-make-fulldeps/symlinked-extern/bar.rs
diff --git a/src/test/run-make/symlinked-extern/baz.rs b/src/test/run-make-fulldeps/symlinked-extern/baz.rs
similarity index 100%
rename from src/test/run-make/symlinked-extern/baz.rs
rename to src/test/run-make-fulldeps/symlinked-extern/baz.rs
diff --git a/src/test/run-make/symlinked-extern/foo.rs b/src/test/run-make-fulldeps/symlinked-extern/foo.rs
similarity index 100%
rename from src/test/run-make/symlinked-extern/foo.rs
rename to src/test/run-make-fulldeps/symlinked-extern/foo.rs
diff --git a/src/test/run-make/symlinked-libraries/Makefile b/src/test/run-make-fulldeps/symlinked-libraries/Makefile
similarity index 100%
rename from src/test/run-make/symlinked-libraries/Makefile
rename to src/test/run-make-fulldeps/symlinked-libraries/Makefile
diff --git a/src/test/run-make/symlinked-libraries/bar.rs b/src/test/run-make-fulldeps/symlinked-libraries/bar.rs
similarity index 100%
rename from src/test/run-make/symlinked-libraries/bar.rs
rename to src/test/run-make-fulldeps/symlinked-libraries/bar.rs
diff --git a/src/test/run-make/symlinked-libraries/foo.rs b/src/test/run-make-fulldeps/symlinked-libraries/foo.rs
similarity index 100%
rename from src/test/run-make/symlinked-libraries/foo.rs
rename to src/test/run-make-fulldeps/symlinked-libraries/foo.rs
diff --git a/src/test/run-make/symlinked-rlib/Makefile b/src/test/run-make-fulldeps/symlinked-rlib/Makefile
similarity index 100%
rename from src/test/run-make/symlinked-rlib/Makefile
rename to src/test/run-make-fulldeps/symlinked-rlib/Makefile
diff --git a/src/test/run-make/symlinked-rlib/bar.rs b/src/test/run-make-fulldeps/symlinked-rlib/bar.rs
similarity index 100%
rename from src/test/run-make/symlinked-rlib/bar.rs
rename to src/test/run-make-fulldeps/symlinked-rlib/bar.rs
diff --git a/src/test/run-make/symlinked-rlib/foo.rs b/src/test/run-make-fulldeps/symlinked-rlib/foo.rs
similarity index 100%
rename from src/test/run-make/symlinked-rlib/foo.rs
rename to src/test/run-make-fulldeps/symlinked-rlib/foo.rs
diff --git a/src/test/run-make/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
similarity index 100%
rename from src/test/run-make/sysroot-crates-are-unstable/Makefile
rename to src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile
diff --git a/src/test/run-make/sysroot-crates-are-unstable/test.py b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
similarity index 100%
rename from src/test/run-make/sysroot-crates-are-unstable/test.py
rename to src/test/run-make-fulldeps/sysroot-crates-are-unstable/test.py
diff --git a/src/test/run-make/target-cpu-native/Makefile b/src/test/run-make-fulldeps/target-cpu-native/Makefile
similarity index 100%
rename from src/test/run-make/target-cpu-native/Makefile
rename to src/test/run-make-fulldeps/target-cpu-native/Makefile
diff --git a/src/test/run-make/target-cpu-native/foo.rs b/src/test/run-make-fulldeps/target-cpu-native/foo.rs
similarity index 100%
rename from src/test/run-make/target-cpu-native/foo.rs
rename to src/test/run-make-fulldeps/target-cpu-native/foo.rs
diff --git a/src/test/run-make/target-specs/Makefile b/src/test/run-make-fulldeps/target-specs/Makefile
similarity index 100%
rename from src/test/run-make/target-specs/Makefile
rename to src/test/run-make-fulldeps/target-specs/Makefile
diff --git a/src/test/run-make/target-specs/foo.rs b/src/test/run-make-fulldeps/target-specs/foo.rs
similarity index 100%
rename from src/test/run-make/target-specs/foo.rs
rename to src/test/run-make-fulldeps/target-specs/foo.rs
diff --git a/src/test/run-make/target-specs/my-awesome-platform.json b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
similarity index 100%
rename from src/test/run-make/target-specs/my-awesome-platform.json
rename to src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
diff --git a/src/test/run-make/target-specs/my-incomplete-platform.json b/src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json
similarity index 100%
rename from src/test/run-make/target-specs/my-incomplete-platform.json
rename to src/test/run-make-fulldeps/target-specs/my-incomplete-platform.json
diff --git a/src/test/run-make/target-specs/my-invalid-platform.json b/src/test/run-make-fulldeps/target-specs/my-invalid-platform.json
similarity index 100%
rename from src/test/run-make/target-specs/my-invalid-platform.json
rename to src/test/run-make-fulldeps/target-specs/my-invalid-platform.json
diff --git a/src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
similarity index 100%
rename from src/test/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json
rename to src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
diff --git a/src/test/run-make/target-without-atomics/Makefile b/src/test/run-make-fulldeps/target-without-atomics/Makefile
similarity index 100%
rename from src/test/run-make/target-without-atomics/Makefile
rename to src/test/run-make-fulldeps/target-without-atomics/Makefile
diff --git a/src/test/run-make/test-harness/Makefile b/src/test/run-make-fulldeps/test-harness/Makefile
similarity index 100%
rename from src/test/run-make/test-harness/Makefile
rename to src/test/run-make-fulldeps/test-harness/Makefile
diff --git a/src/test/run-make/test-harness/test-ignore-cfg.rs b/src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs
similarity index 100%
rename from src/test/run-make/test-harness/test-ignore-cfg.rs
rename to src/test/run-make-fulldeps/test-harness/test-ignore-cfg.rs
diff --git a/src/test/run-make/tools.mk b/src/test/run-make-fulldeps/tools.mk
similarity index 100%
rename from src/test/run-make/tools.mk
rename to src/test/run-make-fulldeps/tools.mk
diff --git a/src/test/run-make/treat-err-as-bug/Makefile b/src/test/run-make-fulldeps/treat-err-as-bug/Makefile
similarity index 100%
rename from src/test/run-make/treat-err-as-bug/Makefile
rename to src/test/run-make-fulldeps/treat-err-as-bug/Makefile
diff --git a/src/test/run-make/treat-err-as-bug/err.rs b/src/test/run-make-fulldeps/treat-err-as-bug/err.rs
similarity index 100%
rename from src/test/run-make/treat-err-as-bug/err.rs
rename to src/test/run-make-fulldeps/treat-err-as-bug/err.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/Makefile b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
similarity index 100%
rename from src/test/run-make/type-mismatch-same-crate-name/Makefile
rename to src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateA.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
similarity index 100%
rename from src/test/run-make/type-mismatch-same-crate-name/crateA.rs
rename to src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateB.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
similarity index 100%
rename from src/test/run-make/type-mismatch-same-crate-name/crateB.rs
rename to src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs
diff --git a/src/test/run-make/type-mismatch-same-crate-name/crateC.rs b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
similarity index 100%
rename from src/test/run-make/type-mismatch-same-crate-name/crateC.rs
rename to src/test/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs
diff --git a/src/test/run-make/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
similarity index 100%
rename from src/test/run-make/use-extern-for-plugins/Makefile
rename to src/test/run-make-fulldeps/use-extern-for-plugins/Makefile
diff --git a/src/test/run-make/use-extern-for-plugins/bar.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs
similarity index 100%
rename from src/test/run-make/use-extern-for-plugins/bar.rs
rename to src/test/run-make-fulldeps/use-extern-for-plugins/bar.rs
diff --git a/src/test/run-make/use-extern-for-plugins/baz.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs
similarity index 100%
rename from src/test/run-make/use-extern-for-plugins/baz.rs
rename to src/test/run-make-fulldeps/use-extern-for-plugins/baz.rs
diff --git a/src/test/run-make/use-extern-for-plugins/foo.rs b/src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs
similarity index 100%
rename from src/test/run-make/use-extern-for-plugins/foo.rs
rename to src/test/run-make-fulldeps/use-extern-for-plugins/foo.rs
diff --git a/src/test/run-make/used/Makefile b/src/test/run-make-fulldeps/used/Makefile
similarity index 100%
rename from src/test/run-make/used/Makefile
rename to src/test/run-make-fulldeps/used/Makefile
diff --git a/src/test/run-make/used/used.rs b/src/test/run-make-fulldeps/used/used.rs
similarity index 100%
rename from src/test/run-make/used/used.rs
rename to src/test/run-make-fulldeps/used/used.rs
diff --git a/src/test/run-make/version/Makefile b/src/test/run-make-fulldeps/version/Makefile
similarity index 100%
rename from src/test/run-make/version/Makefile
rename to src/test/run-make-fulldeps/version/Makefile
diff --git a/src/test/run-make/volatile-intrinsics/Makefile b/src/test/run-make-fulldeps/volatile-intrinsics/Makefile
similarity index 100%
rename from src/test/run-make/volatile-intrinsics/Makefile
rename to src/test/run-make-fulldeps/volatile-intrinsics/Makefile
diff --git a/src/test/run-make/volatile-intrinsics/main.rs b/src/test/run-make-fulldeps/volatile-intrinsics/main.rs
similarity index 100%
rename from src/test/run-make/volatile-intrinsics/main.rs
rename to src/test/run-make-fulldeps/volatile-intrinsics/main.rs
diff --git a/src/test/run-make/weird-output-filenames/Makefile b/src/test/run-make-fulldeps/weird-output-filenames/Makefile
similarity index 100%
rename from src/test/run-make/weird-output-filenames/Makefile
rename to src/test/run-make-fulldeps/weird-output-filenames/Makefile
diff --git a/src/test/run-make/weird-output-filenames/foo.rs b/src/test/run-make-fulldeps/weird-output-filenames/foo.rs
similarity index 100%
rename from src/test/run-make/weird-output-filenames/foo.rs
rename to src/test/run-make-fulldeps/weird-output-filenames/foo.rs
diff --git a/src/test/run-make/windows-spawn/Makefile b/src/test/run-make-fulldeps/windows-spawn/Makefile
similarity index 100%
rename from src/test/run-make/windows-spawn/Makefile
rename to src/test/run-make-fulldeps/windows-spawn/Makefile
diff --git a/src/test/run-make/windows-spawn/hello.rs b/src/test/run-make-fulldeps/windows-spawn/hello.rs
similarity index 100%
rename from src/test/run-make/windows-spawn/hello.rs
rename to src/test/run-make-fulldeps/windows-spawn/hello.rs
diff --git a/src/test/run-make/windows-spawn/spawn.rs b/src/test/run-make-fulldeps/windows-spawn/spawn.rs
similarity index 100%
rename from src/test/run-make/windows-spawn/spawn.rs
rename to src/test/run-make-fulldeps/windows-spawn/spawn.rs
diff --git a/src/test/run-make/windows-subsystem/Makefile b/src/test/run-make-fulldeps/windows-subsystem/Makefile
similarity index 100%
rename from src/test/run-make/windows-subsystem/Makefile
rename to src/test/run-make-fulldeps/windows-subsystem/Makefile
diff --git a/src/test/run-make/windows-subsystem/console.rs b/src/test/run-make-fulldeps/windows-subsystem/console.rs
similarity index 100%
rename from src/test/run-make/windows-subsystem/console.rs
rename to src/test/run-make-fulldeps/windows-subsystem/console.rs
diff --git a/src/test/run-make/windows-subsystem/windows.rs b/src/test/run-make-fulldeps/windows-subsystem/windows.rs
similarity index 100%
rename from src/test/run-make/windows-subsystem/windows.rs
rename to src/test/run-make-fulldeps/windows-subsystem/windows.rs
diff --git a/src/test/run-make/wasm-custom-section/Makefile b/src/test/run-make/wasm-custom-section/Makefile
new file mode 100644
index 0000000000000..399951e516314
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/Makefile
@@ -0,0 +1,10 @@
+-include ../../run-make-fulldeps/tools.mk
+
+ifeq ($(TARGET),wasm32-unknown-unknown)
+all:
+ $(RUSTC) foo.rs --target wasm32-unknown-unknown
+ $(RUSTC) bar.rs -C lto -O --target wasm32-unknown-unknown
+ $(NODE) foo.js $(TMPDIR)/bar.wasm
+else
+all:
+endif
diff --git a/src/test/run-make/wasm-custom-section/bar.rs b/src/test/run-make/wasm-custom-section/bar.rs
new file mode 100644
index 0000000000000..e3db36d6dbd4c
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/bar.rs
@@ -0,0 +1,24 @@
+// Copyright 2018 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.
+
+#![crate_type = "cdylib"]
+#![feature(wasm_custom_section)]
+#![deny(warnings)]
+
+extern crate foo;
+
+#[wasm_custom_section = "foo"]
+const A: [u8; 2] = [5, 6];
+
+#[wasm_custom_section = "baz"]
+const B: [u8; 2] = [7, 8];
+
+#[no_mangle]
+pub extern fn foo() {}
diff --git a/src/test/run-make/wasm-custom-section/foo.js b/src/test/run-make/wasm-custom-section/foo.js
new file mode 100644
index 0000000000000..e7a4cfc344efb
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/foo.js
@@ -0,0 +1,46 @@
+// Copyright 2018 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.
+
+const fs = require('fs');
+const process = require('process');
+const assert = require('assert');
+const buffer = fs.readFileSync(process.argv[2]);
+
+let m = new WebAssembly.Module(buffer);
+let sections = WebAssembly.Module.customSections(m, "baz");
+console.log('section baz', sections);
+assert.strictEqual(sections.length, 1);
+let section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 2);
+assert.strictEqual(section[0], 7);
+assert.strictEqual(section[1], 8);
+
+sections = WebAssembly.Module.customSections(m, "bar");
+console.log('section bar', sections);
+assert.strictEqual(sections.length, 1, "didn't pick up `bar` section from dependency");
+section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 2);
+assert.strictEqual(section[0], 3);
+assert.strictEqual(section[1], 4);
+
+sections = WebAssembly.Module.customSections(m, "foo");
+console.log('section foo', sections);
+assert.strictEqual(sections.length, 1, "didn't create `foo` section");
+section = new Uint8Array(sections[0]);
+console.log('contents', section);
+assert.strictEqual(section.length, 4, "didn't concatenate `foo` sections");
+assert.strictEqual(section[0], 5);
+assert.strictEqual(section[1], 6);
+assert.strictEqual(section[2], 1);
+assert.strictEqual(section[3], 2);
+
+process.exit(0);
diff --git a/src/test/run-make/wasm-custom-section/foo.rs b/src/test/run-make/wasm-custom-section/foo.rs
new file mode 100644
index 0000000000000..44d1efd7c2d62
--- /dev/null
+++ b/src/test/run-make/wasm-custom-section/foo.rs
@@ -0,0 +1,19 @@
+// Copyright 2018 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.
+
+#![crate_type = "rlib"]
+#![feature(wasm_custom_section)]
+#![deny(warnings)]
+
+#[wasm_custom_section = "foo"]
+const A: [u8; 2] = [1, 2];
+
+#[wasm_custom_section = "bar"]
+const B: [u8; 2] = [3, 4];
diff --git a/src/test/run-make/wasm-import-module/Makefile b/src/test/run-make/wasm-import-module/Makefile
new file mode 100644
index 0000000000000..399951e516314
--- /dev/null
+++ b/src/test/run-make/wasm-import-module/Makefile
@@ -0,0 +1,10 @@
+-include ../../run-make-fulldeps/tools.mk
+
+ifeq ($(TARGET),wasm32-unknown-unknown)
+all:
+ $(RUSTC) foo.rs --target wasm32-unknown-unknown
+ $(RUSTC) bar.rs -C lto -O --target wasm32-unknown-unknown
+ $(NODE) foo.js $(TMPDIR)/bar.wasm
+else
+all:
+endif
diff --git a/src/test/run-make/wasm-import-module/bar.rs b/src/test/run-make/wasm-import-module/bar.rs
new file mode 100644
index 0000000000000..9e659223c651c
--- /dev/null
+++ b/src/test/run-make/wasm-import-module/bar.rs
@@ -0,0 +1,29 @@
+// Copyright 2018 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.
+
+#![crate_type = "cdylib"]
+#![feature(wasm_import_module)]
+#![deny(warnings)]
+
+extern crate foo;
+
+#[wasm_import_module = "./me"]
+extern {
+ #[link_name = "me_in_dep"]
+ fn dep();
+}
+
+#[no_mangle]
+pub extern fn foo() {
+ unsafe {
+ foo::dep();
+ dep();
+ }
+}
diff --git a/src/test/run-make/wasm-import-module/foo.js b/src/test/run-make/wasm-import-module/foo.js
new file mode 100644
index 0000000000000..369962e55b1eb
--- /dev/null
+++ b/src/test/run-make/wasm-import-module/foo.js
@@ -0,0 +1,28 @@
+// Copyright 2018 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.
+
+const fs = require('fs');
+const process = require('process');
+const assert = require('assert');
+const buffer = fs.readFileSync(process.argv[2]);
+
+let m = new WebAssembly.Module(buffer);
+let imports = WebAssembly.Module.imports(m);
+console.log('imports', imports);
+assert.strictEqual(imports.length, 2);
+
+assert.strictEqual(imports[0].kind, 'function');
+assert.strictEqual(imports[1].kind, 'function');
+
+let modules = [imports[0].module, imports[1].module];
+modules.sort();
+
+assert.strictEqual(modules[0], './dep');
+assert.strictEqual(modules[1], './me');
diff --git a/src/test/run-make/wasm-import-module/foo.rs b/src/test/run-make/wasm-import-module/foo.rs
new file mode 100644
index 0000000000000..bcd2ca70befaa
--- /dev/null
+++ b/src/test/run-make/wasm-import-module/foo.rs
@@ -0,0 +1,18 @@
+// Copyright 2018 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.
+
+#![crate_type = "rlib"]
+#![feature(wasm_import_module)]
+#![deny(warnings)]
+
+#[wasm_import_module = "./dep"]
+extern {
+ pub fn dep();
+}
diff --git a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
index 17cf39372c0e4..dc6f33bad9979 100644
--- a/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs
@@ -48,7 +48,7 @@ fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
}
let text = match args[0] {
- TokenTree::Token(_, token::Ident(s)) => s.to_string(),
+ TokenTree::Token(_, token::Ident(s, _)) => s.to_string(),
_ => {
cx.span_err(sp, "argument should be a single identifier");
return DummyResult::any(sp);
diff --git a/src/test/run-pass-fulldeps/issue-35829.rs b/src/test/run-pass-fulldeps/issue-35829.rs
index c420243325038..798c214bc4715 100644
--- a/src/test/run-pass-fulldeps/issue-35829.rs
+++ b/src/test/run-pass-fulldeps/issue-35829.rs
@@ -20,8 +20,7 @@ use syntax::ext::expand::ExpansionConfig;
use syntax::parse::ParseSess;
use syntax::codemap::{FilePathMapping, dummy_spanned};
use syntax::print::pprust::expr_to_string;
-use syntax::ast::{Expr, ExprKind, LitKind, StrStyle, RangeLimits};
-use syntax::symbol::Symbol;
+use syntax::ast::{ExprKind, LitKind, RangeLimits};
use syntax::ptr::P;
use rustc_data_structures::sync::Lrc;
diff --git a/src/test/run-pass/dyn-trait.rs b/src/test/run-pass/dyn-trait.rs
index fdec6a26ac945..399823ec92d0c 100644
--- a/src/test/run-pass/dyn-trait.rs
+++ b/src/test/run-pass/dyn-trait.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-// ignore-pretty `dyn ::foo` parses differently in the current epoch
+// ignore-pretty `dyn ::foo` parses differently in the current edition
#![feature(dyn_trait)]
diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/run-pass/enum-null-pointer-opt.rs
index e296aff2782c5..12f17a1575e82 100644
--- a/src/test/run-pass/enum-null-pointer-opt.rs
+++ b/src/test/run-pass/enum-null-pointer-opt.rs
@@ -10,10 +10,9 @@
#![feature(nonzero, core)]
-extern crate core;
-
-use core::nonzero::NonZero;
use std::mem::size_of;
+use std::num::NonZeroUsize;
+use std::ptr::NonNull;
use std::rc::Rc;
use std::sync::Arc;
@@ -59,8 +58,8 @@ fn main() {
assert_eq!(size_of::<[Box<isize>; 1]>(), size_of::<Option<[Box<isize>; 1]>>());
// Should apply to NonZero
- assert_eq!(size_of::<NonZero<usize>>(), size_of::<Option<NonZero<usize>>>());
- assert_eq!(size_of::<NonZero<*mut i8>>(), size_of::<Option<NonZero<*mut i8>>>());
+ assert_eq!(size_of::<NonZeroUsize>(), size_of::<Option<NonZeroUsize>>());
+ assert_eq!(size_of::<NonNull<i8>>(), size_of::<Option<NonNull<i8>>>());
// Should apply to types that use NonZero internally
assert_eq!(size_of::<Vec<isize>>(), size_of::<Option<Vec<isize>>>());
diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/run-pass/epoch-gate-feature.rs
index 37d092c06e02b..f3d8f216e1132 100644
--- a/src/test/run-pass/epoch-gate-feature.rs
+++ b/src/test/run-pass/epoch-gate-feature.rs
@@ -11,7 +11,7 @@
// Checks if the correct registers are being used to pass arguments
// when the sysv64 ABI is specified.
-// compile-flags: -Zepoch=2018
+// compile-flags: -Zedition=2018
pub trait Foo {}
diff --git a/src/test/run-pass/issue-23433.rs b/src/test/run-pass/issue-23433.rs
index 7af732f561deb..9547b2f08a6bc 100644
--- a/src/test/run-pass/issue-23433.rs
+++ b/src/test/run-pass/issue-23433.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-// Don't fail if we encounter a NonZero<*T> where T is an unsized type
+// Don't fail if we encounter a NonNull<T> where T is an unsized type
use std::ptr::NonNull;
diff --git a/src/test/run-pass/process-spawn-nonexistent.rs b/src/test/run-pass/process-spawn-nonexistent.rs
new file mode 100644
index 0000000000000..9219cd625f30f
--- /dev/null
+++ b/src/test/run-pass/process-spawn-nonexistent.rs
@@ -0,0 +1,23 @@
+// Copyright 2018 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.
+
+// ignore-cloudabi no processes
+// ignore-emscripten no processes
+
+use std::io::ErrorKind;
+use std::process::Command;
+
+fn main() {
+ assert_eq!(Command::new("nonexistent")
+ .spawn()
+ .unwrap_err()
+ .kind(),
+ ErrorKind::NotFound);
+}
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs b/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs
new file mode 100644
index 0000000000000..3566babaf4cbd
--- /dev/null
+++ b/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs
@@ -0,0 +1,28 @@
+// Copyright 2018 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.
+
+// ignore-pretty
+
+#![feature(raw_identifiers)]
+
+use std::mem;
+
+#[r#repr(r#C, r#packed)]
+struct Test {
+ a: bool, b: u64
+}
+
+#[r#derive(r#Debug)]
+struct Test2(u32);
+
+pub fn main() {
+ assert_eq!(mem::size_of::<Test>(), 9);
+ assert_eq!("Test2(123)", format!("{:?}", Test2(123)));
+}
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs b/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs
new file mode 100644
index 0000000000000..bd1f52a9b24e0
--- /dev/null
+++ b/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs
@@ -0,0 +1,33 @@
+// Copyright 2018 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.
+
+// ignore-pretty
+
+#![feature(raw_identifiers)]
+
+fn r#fn(r#match: u32) -> u32 {
+ r#match
+}
+
+pub fn main() {
+ let r#struct = 1;
+ assert_eq!(1, r#struct);
+
+ let foo = 2;
+ assert_eq!(2, r#foo);
+
+ let r#bar = 3;
+ assert_eq!(3, bar);
+
+ assert_eq!(4, r#fn(4));
+
+ let r#true = false;
+ assert_eq!(r#true, false);
+}
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs b/src/test/run-pass/rfc-2151-raw-identifiers/items.rs
new file mode 100644
index 0000000000000..5fdc13df8dcb2
--- /dev/null
+++ b/src/test/run-pass/rfc-2151-raw-identifiers/items.rs
@@ -0,0 +1,45 @@
+// Copyright 2018 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.
+
+// ignore-pretty
+
+#![feature(raw_identifiers)]
+
+#[derive(Debug, PartialEq, Eq)]
+struct IntWrapper(u32);
+
+#[derive(Debug, Ord, PartialOrd, PartialEq, Eq, Hash, Copy, Clone, Default)]
+struct HasKeywordField {
+ r#struct: u32,
+}
+
+struct Generic<r#T>(T);
+
+trait Trait {
+ fn r#trait(&self) -> u32;
+}
+impl Trait for Generic<u32> {
+ fn r#trait(&self) -> u32 {
+ self.0
+ }
+}
+
+pub fn main() {
+ assert_eq!(IntWrapper(1), r#IntWrapper(1));
+
+ match IntWrapper(2) {
+ r#IntWrapper(r#struct) => assert_eq!(2, r#struct),
+ }
+
+ assert_eq!("HasKeywordField { struct: 3 }", format!("{:?}", HasKeywordField { r#struct: 3 }));
+
+ assert_eq!(4, Generic(4).0);
+ assert_eq!(5, Generic(5).r#trait());
+}
diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs b/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs
new file mode 100644
index 0000000000000..82d44c57e181b
--- /dev/null
+++ b/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs
@@ -0,0 +1,50 @@
+// Copyright 2018 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.
+
+// ignore-pretty
+
+#![feature(decl_macro)]
+#![feature(raw_identifiers)]
+
+r#macro_rules! r#struct {
+ ($r#struct:expr) => { $r#struct }
+}
+
+macro_rules! old_macro {
+ ($a:expr) => {$a}
+}
+
+macro r#decl_macro($r#fn:expr) {
+ $r#fn
+}
+
+macro passthrough($id:ident) {
+ $id
+}
+
+macro_rules! test_pat_match {
+ (a) => { 6 };
+ (r#a) => { 7 };
+}
+
+pub fn main() {
+ r#println!("{struct}", r#struct = 1);
+ assert_eq!(2, r#struct!(2));
+ assert_eq!(3, r#old_macro!(3));
+ assert_eq!(4, decl_macro!(4));
+
+ let r#match = 5;
+ assert_eq!(5, passthrough!(r#match));
+
+ assert_eq!("r#struct", stringify!(r#struct));
+
+ assert_eq!(6, test_pat_match!(a));
+ assert_eq!(7, test_pat_match!(r#a));
+}
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
index 45dce3d8740d1..169a12ef92e98 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
@@ -46,7 +46,7 @@ error[E0223]: ambiguous associated type
LL | type A = [u8; 4]::AssocTy;
| ^^^^^^^^^^^^^^^^ ambiguous associated type
|
- = note: specify the type using the syntax `<[u8; <unevaluated[]>] as Trait>::AssocTy`
+ = note: specify the type using the syntax `<[u8; _] as Trait>::AssocTy`
error[E0223]: ambiguous associated type
--> $DIR/bad-assoc-ty.rs:15:10
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/src/test/ui/error-codes/E0026-teach.stderr
index 63d072fe03d0a..67ea32fba86d6 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/src/test/ui/error-codes/E0026-teach.stderr
@@ -2,7 +2,7 @@ error[E0026]: struct `Thing` does not have a field named `z`
--> $DIR/E0026-teach.rs:21:23
|
LL | Thing { x, y, z } => {}
- | ^ struct `Thing` does not have field `z`
+ | ^ struct `Thing` does not have this field
|
= note: This error indicates that a struct pattern attempted to extract a non-existent field from a struct. Struct fields are identified by the name used before the colon : so struct patterns should resemble the declaration of the struct type being matched.
diff --git a/src/test/ui/error-codes/E0026.stderr b/src/test/ui/error-codes/E0026.stderr
index af8519511276c..9dabbc8a775fb 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/src/test/ui/error-codes/E0026.stderr
@@ -2,7 +2,7 @@ error[E0026]: struct `Thing` does not have a field named `z`
--> $DIR/E0026.rs:19:23
|
LL | Thing { x, y, z } => {}
- | ^ struct `Thing` does not have field `z`
+ | ^ struct `Thing` does not have this field
error: aborting due to previous error
diff --git a/src/test/ui/feature-gate-raw-identifiers.rs b/src/test/ui/feature-gate-raw-identifiers.rs
new file mode 100644
index 0000000000000..38024feb432d9
--- /dev/null
+++ b/src/test/ui/feature-gate-raw-identifiers.rs
@@ -0,0 +1,14 @@
+// Copyright 2018 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.
+
+fn main() {
+ let r#foo = 3; //~ ERROR raw identifiers are experimental and subject to change
+ println!("{}", foo);
+}
diff --git a/src/test/ui/feature-gate-raw-identifiers.stderr b/src/test/ui/feature-gate-raw-identifiers.stderr
new file mode 100644
index 0000000000000..02eff7247c47b
--- /dev/null
+++ b/src/test/ui/feature-gate-raw-identifiers.stderr
@@ -0,0 +1,11 @@
+error[E0658]: raw identifiers are experimental and subject to change (see issue #48589)
+ --> $DIR/feature-gate-raw-identifiers.rs:12:9
+ |
+LL | let r#foo = 3; //~ ERROR raw identifiers are experimental and subject to change
+ | ^^^^^
+ |
+ = help: add #![feature(raw_identifiers)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-wasm_custom_section.rs b/src/test/ui/feature-gate-wasm_custom_section.rs
new file mode 100644
index 0000000000000..c695ef4ff068f
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_custom_section.rs
@@ -0,0 +1,14 @@
+// Copyright 2018 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.
+
+#[wasm_custom_section = "foo"] //~ ERROR: attribute is currently unstable
+const A: [u8; 2] = [1, 2];
+
+fn main() {}
diff --git a/src/test/ui/feature-gate-wasm_custom_section.stderr b/src/test/ui/feature-gate-wasm_custom_section.stderr
new file mode 100644
index 0000000000000..1b4415539f449
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_custom_section.stderr
@@ -0,0 +1,11 @@
+error[E0658]: attribute is currently unstable
+ --> $DIR/feature-gate-wasm_custom_section.rs:11:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: attribute is currently unstable
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: add #![feature(wasm_custom_section)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gate-wasm_import_module.rs b/src/test/ui/feature-gate-wasm_import_module.rs
new file mode 100644
index 0000000000000..c5898a9c12697
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_import_module.rs
@@ -0,0 +1,15 @@
+// Copyright 2018 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.
+
+#[wasm_import_module = "test"] //~ ERROR: experimental
+extern {
+}
+
+fn main() {}
diff --git a/src/test/ui/feature-gate-wasm_import_module.stderr b/src/test/ui/feature-gate-wasm_import_module.stderr
new file mode 100644
index 0000000000000..bae5fa9d5956c
--- /dev/null
+++ b/src/test/ui/feature-gate-wasm_import_module.stderr
@@ -0,0 +1,11 @@
+error[E0658]: experimental attribute
+ --> $DIR/feature-gate-wasm_import_module.rs:11:1
+ |
+LL | #[wasm_import_module = "test"] //~ ERROR: experimental
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: add #![feature(wasm_import_module)] to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/param-bounds-ignored.rs b/src/test/ui/higher-lifetime-bounds.rs
similarity index 77%
rename from src/test/ui/param-bounds-ignored.rs
rename to src/test/ui/higher-lifetime-bounds.rs
index 94bcdec945035..70b3b34fbd8fc 100644
--- a/src/test/ui/param-bounds-ignored.rs
+++ b/src/test/ui/higher-lifetime-bounds.rs
@@ -10,31 +10,7 @@
#![allow(dead_code, non_camel_case_types)]
-use std::rc::Rc;
-
-type SVec<T: Send+Send> = Vec<T>;
-//~^ WARN bounds on generic parameters are ignored in type aliases
-type VVec<'b, 'a: 'b+'b> = Vec<&'a i32>;
-//~^ WARN bounds on generic parameters are ignored in type aliases
-type WVec<'b, T: 'b+'b> = Vec<T>;
-//~^ WARN bounds on generic parameters are ignored in type aliases
-type W2Vec<'b, T> where T: 'b, T: 'b = Vec<T>;
-//~^ WARN where clauses are ignored in type aliases
-
-fn foo<'a>(y: &'a i32) {
- // If the bounds above would matter, the code below would be rejected.
- let mut x : SVec<_> = Vec::new();
- x.push(Rc::new(42));
-
- let mut x : VVec<'static, 'a> = Vec::new();
- x.push(y);
-
- let mut x : WVec<'static, & 'a i32> = Vec::new();
- x.push(y);
-
- let mut x : W2Vec<'static, & 'a i32> = Vec::new();
- x.push(y);
-}
+// Test that bounds on higher-kinded lifetime binders are rejected.
fn bar1<'a, 'b>(
x: &'a i32,
diff --git a/src/test/ui/param-bounds-ignored.stderr b/src/test/ui/higher-lifetime-bounds.stderr
similarity index 61%
rename from src/test/ui/param-bounds-ignored.stderr
rename to src/test/ui/higher-lifetime-bounds.stderr
index 657fec54f9608..82c0074743604 100644
--- a/src/test/ui/param-bounds-ignored.stderr
+++ b/src/test/ui/higher-lifetime-bounds.stderr
@@ -1,94 +1,68 @@
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:42:22
+ --> $DIR/higher-lifetime-bounds.rs:18:22
|
LL | f: for<'xa, 'xb: 'xa+'xa> fn(&'xa i32, &'xb i32) -> &'xa i32)
| ^^^ ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:50:34
+ --> $DIR/higher-lifetime-bounds.rs:26:34
|
LL | fn bar2<'a, 'b, F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32>(
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:65:28
+ --> $DIR/higher-lifetime-bounds.rs:41:28
|
LL | where F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:77:25
+ --> $DIR/higher-lifetime-bounds.rs:53:25
|
LL | where for<'xa, 'xb: 'xa> F: Fn(&'xa i32, &'xb i32) -> &'xa i32
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:85:28
+ --> $DIR/higher-lifetime-bounds.rs:61:28
|
LL | struct S1<F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32>(F);
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:87:40
+ --> $DIR/higher-lifetime-bounds.rs:63:40
|
LL | struct S2<F>(F) where F: for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32;
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:89:37
+ --> $DIR/higher-lifetime-bounds.rs:65:37
|
LL | struct S3<F>(F) where for<'xa, 'xb: 'xa> F: Fn(&'xa i32, &'xb i32) -> &'xa i32;
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:92:29
+ --> $DIR/higher-lifetime-bounds.rs:68:29
|
LL | struct S_fnty(for<'xa, 'xb: 'xa> fn(&'xa i32, &'xb i32) -> &'xa i32);
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:95:29
+ --> $DIR/higher-lifetime-bounds.rs:71:29
|
LL | type T1 = Box<for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32>;
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:99:34
+ --> $DIR/higher-lifetime-bounds.rs:75:34
|
LL | let _ : Option<for<'xa, 'xb: 'xa> fn(&'xa i32, &'xb i32) -> &'xa i32> = None;
| ^^^
error: lifetime bounds cannot be used in this context
- --> $DIR/param-bounds-ignored.rs:101:38
+ --> $DIR/higher-lifetime-bounds.rs:77:38
|
LL | let _ : Option<Box<for<'xa, 'xb: 'xa> Fn(&'xa i32, &'xb i32) -> &'xa i32>> = None;
| ^^^
-warning: bounds on generic parameters are ignored in type aliases
- --> $DIR/param-bounds-ignored.rs:15:14
- |
-LL | type SVec<T: Send+Send> = Vec<T>;
- | ^^^^ ^^^^
- |
- = note: #[warn(ignored_generic_bounds)] on by default
-
-warning: bounds on generic parameters are ignored in type aliases
- --> $DIR/param-bounds-ignored.rs:17:19
- |
-LL | type VVec<'b, 'a: 'b+'b> = Vec<&'a i32>;
- | ^^ ^^
-
-warning: bounds on generic parameters are ignored in type aliases
- --> $DIR/param-bounds-ignored.rs:19:18
- |
-LL | type WVec<'b, T: 'b+'b> = Vec<T>;
- | ^^ ^^
-
-warning: where clauses are ignored in type aliases
- --> $DIR/param-bounds-ignored.rs:21:25
- |
-LL | type W2Vec<'b, T> where T: 'b, T: 'b = Vec<T>;
- | ^^^^^ ^^^^^
-
error: aborting due to 11 previous errors
diff --git a/src/test/ui/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference-variable-behind-raw-pointer.stderr
index eb40151615dad..fe6dc0b07482f 100644
--- a/src/test/ui/inference-variable-behind-raw-pointer.stderr
+++ b/src/test/ui/inference-variable-behind-raw-pointer.stderr
@@ -5,6 +5,6 @@ LL | if data.is_null() {}
| ^^^^^^^
|
= note: #[warn(tyvar_behind_raw_pointer)] on by default
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 epoch!
+ = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
= note: for more information, see issue #46906 <https://github.com/rust-lang/rust/issues/46906>
diff --git a/src/test/ui/missing-fields-in-struct-pattern.rs b/src/test/ui/missing-fields-in-struct-pattern.rs
new file mode 100644
index 0000000000000..dfde37994998b
--- /dev/null
+++ b/src/test/ui/missing-fields-in-struct-pattern.rs
@@ -0,0 +1,19 @@
+// Copyright 2018 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.
+
+struct S(usize, usize, usize, usize);
+
+fn main() {
+ if let S { a, b, c, d } = S(1, 2, 3, 4) {
+ //~^ ERROR struct `S` does not have fields named `a`, `b`, `c`, `d` [E0026]
+ //~| ERROR pattern does not mention fields `0`, `1`, `2`, `3` [E0027]
+ println!("hi");
+ }
+}
diff --git a/src/test/ui/missing-fields-in-struct-pattern.stderr b/src/test/ui/missing-fields-in-struct-pattern.stderr
new file mode 100644
index 0000000000000..d1c3260f11e30
--- /dev/null
+++ b/src/test/ui/missing-fields-in-struct-pattern.stderr
@@ -0,0 +1,18 @@
+error[E0026]: struct `S` does not have fields named `a`, `b`, `c`, `d`
+ --> $DIR/missing-fields-in-struct-pattern.rs:14:16
+ |
+LL | if let S { a, b, c, d } = S(1, 2, 3, 4) {
+ | ^ ^ ^ ^ struct `S` does not have these fields
+
+error[E0027]: pattern does not mention fields `0`, `1`, `2`, `3`
+ --> $DIR/missing-fields-in-struct-pattern.rs:14:12
+ |
+LL | if let S { a, b, c, d } = S(1, 2, 3, 4) {
+ | ^^^^^^^^^^^^^^^^ missing fields `0`, `1`, `2`, `3`
+ |
+ = note: trying to match a tuple variant with a struct variant pattern
+
+error: aborting due to 2 previous errors
+
+Some errors occurred: E0026, E0027.
+For more information about an error, try `rustc --explain E0026`.
diff --git a/src/test/ui/nll/issue-48238.rs b/src/test/ui/nll/issue-48238.rs
new file mode 100644
index 0000000000000..6f7644da3d349
--- /dev/null
+++ b/src/test/ui/nll/issue-48238.rs
@@ -0,0 +1,22 @@
+// Copyright 2018 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.
+
+// Regression test for issue #48238
+
+#![feature(nll)]
+
+fn use_val<'a>(val: &'a u8) -> &'a u8 {
+ val
+}
+
+fn main() {
+ let orig: u8 = 5;
+ move || use_val(&orig); //~ ERROR free region `` does not outlive free region `'_#1r`
+}
diff --git a/src/test/ui/nll/issue-48238.stderr b/src/test/ui/nll/issue-48238.stderr
new file mode 100644
index 0000000000000..29385d9b2430f
--- /dev/null
+++ b/src/test/ui/nll/issue-48238.stderr
@@ -0,0 +1,8 @@
+error: free region `` does not outlive free region `'_#1r`
+ --> $DIR/issue-48238.rs:21:21
+ |
+LL | move || use_val(&orig); //~ ERROR free region `` does not outlive free region `'_#1r`
+ | ^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/numeric-fields.stderr b/src/test/ui/numeric-fields.stderr
index 607980ba3bf54..68a87da8ded32 100644
--- a/src/test/ui/numeric-fields.stderr
+++ b/src/test/ui/numeric-fields.stderr
@@ -10,7 +10,7 @@ error[E0026]: struct `S` does not have a field named `0x1`
--> $DIR/numeric-fields.rs:17:17
|
LL | S{0: a, 0x1: b, ..} => {}
- | ^^^^^^ struct `S` does not have field `0x1`
+ | ^^^^^^ struct `S` does not have this field
error: aborting due to 2 previous errors
diff --git a/src/test/ui/print_type_sizes/niche-filling.rs b/src/test/ui/print_type_sizes/niche-filling.rs
index 7f234e243e926..875883a2cca7f 100644
--- a/src/test/ui/print_type_sizes/niche-filling.rs
+++ b/src/test/ui/print_type_sizes/niche-filling.rs
@@ -14,7 +14,7 @@
// This file illustrates how niche-filling enums are handled,
// modelled after cases like `Option<&u32>`, `Option<bool>` and such.
//
-// It uses NonZero directly, rather than `&_` or `Unique<_>`, because
+// It uses NonZeroU32 rather than `&_` or `Unique<_>`, because
// the test is not set up to deal with target-dependent pointer width.
//
// It avoids using u64/i64 because on some targets that is only 4-byte
@@ -25,8 +25,7 @@
#![feature(nonzero)]
#![allow(dead_code)]
-extern crate core;
-use core::nonzero::{NonZero, Zeroable};
+use std::num::NonZeroU32;
pub enum MyOption<T> { None, Some(T) }
@@ -36,7 +35,7 @@ impl<T> Default for MyOption<T> {
pub enum EmbeddedDiscr {
None,
- Record { pre: u8, val: NonZero<u32>, post: u16 },
+ Record { pre: u8, val: NonZeroU32, post: u16 },
}
impl Default for EmbeddedDiscr {
@@ -44,32 +43,24 @@ impl Default for EmbeddedDiscr {
}
#[derive(Default)]
-pub struct IndirectNonZero<T: Zeroable + One> {
+pub struct IndirectNonZero {
pre: u8,
- nested: NestedNonZero<T>,
+ nested: NestedNonZero,
post: u16,
}
-pub struct NestedNonZero<T: Zeroable> {
+pub struct NestedNonZero {
pre: u8,
- val: NonZero<T>,
+ val: NonZeroU32,
post: u16,
}
-impl<T: Zeroable+One> Default for NestedNonZero<T> {
+impl Default for NestedNonZero {
fn default() -> Self {
- NestedNonZero { pre: 0, val: NonZero::new(T::one()).unwrap(), post: 0 }
+ NestedNonZero { pre: 0, val: NonZeroU32::new(1).unwrap(), post: 0 }
}
}
-pub trait One {
- fn one() -> Self;
-}
-
-impl One for u32 {
- fn one() -> Self { 1 }
-}
-
pub enum Enum4<A, B, C, D> {
One(A),
Two(B),
@@ -79,9 +70,9 @@ pub enum Enum4<A, B, C, D> {
#[start]
fn start(_: isize, _: *const *const u8) -> isize {
- let _x: MyOption<NonZero<u32>> = Default::default();
+ let _x: MyOption<NonZeroU32> = Default::default();
let _y: EmbeddedDiscr = Default::default();
- let _z: MyOption<IndirectNonZero<u32>> = Default::default();
+ let _z: MyOption<IndirectNonZero> = Default::default();
let _a: MyOption<bool> = Default::default();
let _b: MyOption<char> = Default::default();
let _c: MyOption<std::cmp::Ordering> = Default::default();
diff --git a/src/test/ui/print_type_sizes/niche-filling.stdout b/src/test/ui/print_type_sizes/niche-filling.stdout
index 0f53e7722dd51..79f9ef5a231d3 100644
--- a/src/test/ui/print_type_sizes/niche-filling.stdout
+++ b/src/test/ui/print_type_sizes/niche-filling.stdout
@@ -1,9 +1,9 @@
-print-type-size type: `IndirectNonZero<u32>`: 12 bytes, alignment: 4 bytes
+print-type-size type: `IndirectNonZero`: 12 bytes, alignment: 4 bytes
print-type-size field `.nested`: 8 bytes
print-type-size field `.post`: 2 bytes
print-type-size field `.pre`: 1 bytes
print-type-size end padding: 1 bytes
-print-type-size type: `MyOption<IndirectNonZero<u32>>`: 12 bytes, alignment: 4 bytes
+print-type-size type: `MyOption<IndirectNonZero>`: 12 bytes, alignment: 4 bytes
print-type-size variant `None`: 0 bytes
print-type-size variant `Some`: 12 bytes
print-type-size field `.0`: 12 bytes
@@ -14,7 +14,7 @@ print-type-size field `.val`: 4 bytes
print-type-size field `.post`: 2 bytes
print-type-size field `.pre`: 1 bytes
print-type-size end padding: 1 bytes
-print-type-size type: `NestedNonZero<u32>`: 8 bytes, alignment: 4 bytes
+print-type-size type: `NestedNonZero`: 8 bytes, alignment: 4 bytes
print-type-size field `.val`: 4 bytes
print-type-size field `.post`: 2 bytes
print-type-size field `.pre`: 1 bytes
@@ -32,12 +32,14 @@ print-type-size type: `MyOption<char>`: 4 bytes, alignment: 4 bytes
print-type-size variant `None`: 0 bytes
print-type-size variant `Some`: 4 bytes
print-type-size field `.0`: 4 bytes
-print-type-size type: `MyOption<core::nonzero::NonZero<u32>>`: 4 bytes, alignment: 4 bytes
+print-type-size type: `MyOption<std::num::NonZeroU32>`: 4 bytes, alignment: 4 bytes
print-type-size variant `None`: 0 bytes
print-type-size variant `Some`: 4 bytes
print-type-size field `.0`: 4 bytes
print-type-size type: `core::nonzero::NonZero<u32>`: 4 bytes, alignment: 4 bytes
print-type-size field `.0`: 4 bytes
+print-type-size type: `std::num::NonZeroU32`: 4 bytes, alignment: 4 bytes
+print-type-size field `.0`: 4 bytes
print-type-size type: `Enum4<(), (), (), MyOption<u8>>`: 2 bytes, alignment: 1 bytes
print-type-size variant `One`: 0 bytes
print-type-size field `.0`: 0 bytes
diff --git a/src/test/ui/raw-literal-keywords.rs b/src/test/ui/raw-literal-keywords.rs
new file mode 100644
index 0000000000000..9b28aa0b15116
--- /dev/null
+++ b/src/test/ui/raw-literal-keywords.rs
@@ -0,0 +1,26 @@
+// Copyright 2018 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.
+
+// compile-flags: -Z parse-only
+
+#![feature(dyn_trait)]
+#![feature(raw_identifiers)]
+
+fn test_if() {
+ r#if true { } //~ ERROR found `true`
+}
+
+fn test_struct() {
+ r#struct Test; //~ ERROR found `Test`
+}
+
+fn test_union() {
+ r#union Test; //~ ERROR found `Test`
+}
diff --git a/src/test/ui/raw-literal-keywords.stderr b/src/test/ui/raw-literal-keywords.stderr
new file mode 100644
index 0000000000000..3758568323cc0
--- /dev/null
+++ b/src/test/ui/raw-literal-keywords.stderr
@@ -0,0 +1,20 @@
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `true`
+ --> $DIR/raw-literal-keywords.rs:17:10
+ |
+LL | r#if true { } //~ ERROR found `true`
+ | ^^^^ expected one of 8 possible tokens here
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test`
+ --> $DIR/raw-literal-keywords.rs:21:14
+ |
+LL | r#struct Test; //~ ERROR found `Test`
+ | ^^^^ expected one of 8 possible tokens here
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `Test`
+ --> $DIR/raw-literal-keywords.rs:25:13
+ |
+LL | r#union Test; //~ ERROR found `Test`
+ | ^^^^ expected one of 8 possible tokens here
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/raw-literal-self.rs b/src/test/ui/raw-literal-self.rs
new file mode 100644
index 0000000000000..f88d6cf9a67bd
--- /dev/null
+++ b/src/test/ui/raw-literal-self.rs
@@ -0,0 +1,17 @@
+// Copyright 2018 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.
+
+// compile-flags: -Z parse-only
+
+#![feature(raw_identifiers)]
+
+fn self_test(r#self: u32) {
+ //~^ ERROR `r#self` is not currently supported.
+}
diff --git a/src/test/ui/raw-literal-self.stderr b/src/test/ui/raw-literal-self.stderr
new file mode 100644
index 0000000000000..e3345847aa895
--- /dev/null
+++ b/src/test/ui/raw-literal-self.stderr
@@ -0,0 +1,8 @@
+error: `r#self` is not currently supported.
+ --> $DIR/raw-literal-self.rs:15:14
+ |
+LL | fn self_test(r#self: u32) {
+ | ^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/raw-literal-underscore.rs b/src/test/ui/raw-literal-underscore.rs
new file mode 100644
index 0000000000000..ec33e4861958e
--- /dev/null
+++ b/src/test/ui/raw-literal-underscore.rs
@@ -0,0 +1,15 @@
+// Copyright 2018 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.
+
+// compile-flags: -Z parse-only
+
+fn underscore_test(r#_: u32) {
+ //~^ ERROR `r#_` is not currently supported.
+}
diff --git a/src/test/ui/raw-literal-underscore.stderr b/src/test/ui/raw-literal-underscore.stderr
new file mode 100644
index 0000000000000..8072eee4f0604
--- /dev/null
+++ b/src/test/ui/raw-literal-underscore.stderr
@@ -0,0 +1,8 @@
+error: `r#_` is not currently supported.
+ --> $DIR/raw-literal-underscore.rs:13:20
+ |
+LL | fn underscore_test(r#_: u32) {
+ | ^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/type-alias-bounds.rs b/src/test/ui/type-alias-bounds.rs
new file mode 100644
index 0000000000000..c1cdeef3a4638
--- /dev/null
+++ b/src/test/ui/type-alias-bounds.rs
@@ -0,0 +1,69 @@
+// 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.
+
+// Test ignored_generic_bounds lint warning about bounds in type aliases
+
+// must-compile-successfully
+#![allow(dead_code)]
+
+use std::rc::Rc;
+
+type SVec<T: Send+Send> = Vec<T>;
+//~^ WARN bounds on generic parameters are not enforced in type aliases [type_alias_bounds]
+type S2Vec<T> where T: Send = Vec<T>;
+//~^ WARN where clauses are not enforced in type aliases [type_alias_bounds]
+type VVec<'b, 'a: 'b+'b> = (&'b u32, Vec<&'a i32>);
+//~^ WARN bounds on generic parameters are not enforced in type aliases [type_alias_bounds]
+type WVec<'b, T: 'b+'b> = (&'b u32, Vec<T>);
+//~^ WARN bounds on generic parameters are not enforced in type aliases [type_alias_bounds]
+type W2Vec<'b, T> where T: 'b, T: 'b = (&'b u32, Vec<T>);
+//~^ WARN where clauses are not enforced in type aliases [type_alias_bounds]
+
+static STATIC : u32 = 0;
+
+fn foo<'a>(y: &'a i32) {
+ // If any of the bounds above would matter, the code below would be rejected.
+ // This can be seen when replacing the type aliases above by newtype structs.
+ // (The type aliases have no unused parameters to make that a valid transformation.)
+ let mut x : SVec<_> = Vec::new();
+ x.push(Rc::new(42)); // is not send
+
+ let mut x : S2Vec<_> = Vec::new();
+ x.push(Rc::new(42)); // is not send
+
+ let mut x : VVec<'static, 'a> = (&STATIC, Vec::new());
+ x.1.push(y); // 'a: 'static does not hold
+
+ let mut x : WVec<'static, &'a i32> = (&STATIC, Vec::new());
+ x.1.push(y); // &'a i32: 'static does not hold
+
+ let mut x : W2Vec<'static, &'a i32> = (&STATIC, Vec::new());
+ x.1.push(y); // &'a i32: 'static does not hold
+}
+
+// Bounds are not checked either, i.e. the definition is not necessarily well-formed
+struct Sendable<T: Send>(T);
+type MySendable<T> = Sendable<T>; // no error here!
+
+// However, bounds *are* taken into account when accessing associated types
+trait Bound { type Assoc; }
+type T1<U: Bound> = U::Assoc; //~ WARN not enforced in type aliases
+type T2<U> where U: Bound = U::Assoc; //~ WARN not enforced in type aliases
+
+// This errors
+// type T3<U> = U::Assoc;
+// Do this instead
+type T4<U> = <U as Bound>::Assoc;
+
+// Make sure the help about associatd types is not shown incorrectly
+type T5<U: Bound> = <U as Bound>::Assoc; //~ WARN not enforced in type aliases
+type T6<U: Bound> = ::std::vec::Vec<U>; //~ WARN not enforced in type aliases
+
+fn main() {}
diff --git a/src/test/ui/type-alias-bounds.stderr b/src/test/ui/type-alias-bounds.stderr
new file mode 100644
index 0000000000000..2a2b0b0f26e34
--- /dev/null
+++ b/src/test/ui/type-alias-bounds.stderr
@@ -0,0 +1,83 @@
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:18:14
+ |
+LL | type SVec<T: Send+Send> = Vec<T>;
+ | ^^^^ ^^^^
+ |
+ = note: #[warn(type_alias_bounds)] on by default
+ = help: the bound will not be checked when the type alias is used, and should be removed
+
+warning: where clauses are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:20:21
+ |
+LL | type S2Vec<T> where T: Send = Vec<T>;
+ | ^^^^^^^
+ |
+ = help: the clause will not be checked when the type alias is used, and should be removed
+
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:22:19
+ |
+LL | type VVec<'b, 'a: 'b+'b> = (&'b u32, Vec<&'a i32>);
+ | ^^ ^^
+ |
+ = help: the bound will not be checked when the type alias is used, and should be removed
+
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:24:18
+ |
+LL | type WVec<'b, T: 'b+'b> = (&'b u32, Vec<T>);
+ | ^^ ^^
+ |
+ = help: the bound will not be checked when the type alias is used, and should be removed
+
+warning: where clauses are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:26:25
+ |
+LL | type W2Vec<'b, T> where T: 'b, T: 'b = (&'b u32, Vec<T>);
+ | ^^^^^ ^^^^^
+ |
+ = help: the clause will not be checked when the type alias is used, and should be removed
+
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:57:12
+ |
+LL | type T1<U: Bound> = U::Assoc; //~ WARN not enforced in type aliases
+ | ^^^^^
+ |
+ = help: the bound will not be checked when the type alias is used, and should be removed
+help: use fully disambiguated paths (i.e., `<T as Trait>::Assoc`) to refer to associated types in type aliases
+ --> $DIR/type-alias-bounds.rs:57:21
+ |
+LL | type T1<U: Bound> = U::Assoc; //~ WARN not enforced in type aliases
+ | ^^^^^^^^
+
+warning: where clauses are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:58:18
+ |
+LL | type T2<U> where U: Bound = U::Assoc; //~ WARN not enforced in type aliases
+ | ^^^^^^^^
+ |
+ = help: the clause will not be checked when the type alias is used, and should be removed
+help: use fully disambiguated paths (i.e., `<T as Trait>::Assoc`) to refer to associated types in type aliases
+ --> $DIR/type-alias-bounds.rs:58:29
+ |
+LL | type T2<U> where U: Bound = U::Assoc; //~ WARN not enforced in type aliases
+ | ^^^^^^^^
+
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:66:12
+ |
+LL | type T5<U: Bound> = <U as Bound>::Assoc; //~ WARN not enforced in type aliases
+ | ^^^^^
+ |
+ = help: the bound will not be checked when the type alias is used, and should be removed
+
+warning: bounds on generic parameters are not enforced in type aliases
+ --> $DIR/type-alias-bounds.rs:67:12
+ |
+LL | type T6<U: Bound> = ::std::vec::Vec<U>; //~ WARN not enforced in type aliases
+ | ^^^^^
+ |
+ = help: the bound will not be checked when the type alias is used, and should be removed
+
diff --git a/src/test/ui/type-check/issue-41314.stderr b/src/test/ui/type-check/issue-41314.stderr
index bcb0f9a99a779..f7d4bb9a02f45 100644
--- a/src/test/ui/type-check/issue-41314.stderr
+++ b/src/test/ui/type-check/issue-41314.stderr
@@ -2,7 +2,7 @@ error[E0026]: variant `X::Y` does not have a field named `number`
--> $DIR/issue-41314.rs:17:16
|
LL | X::Y { number } => {} //~ ERROR does not have a field named `number`
- | ^^^^^^ variant `X::Y` does not have field `number`
+ | ^^^^^^ variant `X::Y` does not have this field
error[E0027]: pattern does not mention field `0`
--> $DIR/issue-41314.rs:17:9
diff --git a/src/test/ui/unevaluated_fixed_size_array_len.rs b/src/test/ui/unevaluated_fixed_size_array_len.rs
new file mode 100644
index 0000000000000..a6ed9f32106fb
--- /dev/null
+++ b/src/test/ui/unevaluated_fixed_size_array_len.rs
@@ -0,0 +1,23 @@
+// Copyright 2018 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.
+
+// https://github.com/rust-lang/rust/issues/49208
+
+trait Foo {
+ fn foo();
+}
+
+impl Foo for [(); 1] {
+ fn foo() {}
+}
+
+fn main() {
+ <[(); 0] as Foo>::foo() //~ ERROR E0277
+}
diff --git a/src/test/ui/unevaluated_fixed_size_array_len.stderr b/src/test/ui/unevaluated_fixed_size_array_len.stderr
new file mode 100644
index 0000000000000..6e959da99397b
--- /dev/null
+++ b/src/test/ui/unevaluated_fixed_size_array_len.stderr
@@ -0,0 +1,17 @@
+error[E0277]: the trait bound `[(); 0]: Foo` is not satisfied
+ --> $DIR/unevaluated_fixed_size_array_len.rs:22:5
+ |
+LL | <[(); 0] as Foo>::foo() //~ ERROR E0277
+ | ^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `[(); 0]`
+ |
+ = help: the following implementations were found:
+ <[(); 1] as Foo>
+note: required by `Foo::foo`
+ --> $DIR/unevaluated_fixed_size_array_len.rs:14:5
+ |
+LL | fn foo();
+ | ^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/union/union-fields-2.stderr b/src/test/ui/union/union-fields-2.stderr
index 3ea4d3426dad7..cfb5bc7520b59 100644
--- a/src/test/ui/union/union-fields-2.stderr
+++ b/src/test/ui/union/union-fields-2.stderr
@@ -52,7 +52,7 @@ error[E0026]: union `U` does not have a field named `c`
--> $DIR/union-fields-2.rs:28:19
|
LL | let U { a, b, c } = u; //~ ERROR union patterns should have exactly one field
- | ^ union `U` does not have field `c`
+ | ^ union `U` does not have this field
error: union patterns should have exactly one field
--> $DIR/union-fields-2.rs:28:9
diff --git a/src/test/ui/wasm-custom-section/malformed.rs b/src/test/ui/wasm-custom-section/malformed.rs
new file mode 100644
index 0000000000000..13b1685a48072
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/malformed.rs
@@ -0,0 +1,19 @@
+// Copyright 2018 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.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section] //~ ERROR: must be of the form
+const A: [u8; 1] = [0];
+
+#[wasm_custom_section(foo)] //~ ERROR: must be of the form
+const B: [u8; 1] = [0];
+
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/malformed.stderr b/src/test/ui/wasm-custom-section/malformed.stderr
new file mode 100644
index 0000000000000..c716c824aebda
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/malformed.stderr
@@ -0,0 +1,14 @@
+error: must be of the form #[wasm_custom_section = "foo"]
+ --> $DIR/malformed.rs:13:1
+ |
+LL | #[wasm_custom_section] //~ ERROR: must be of the form
+ | ^^^^^^^^^^^^^^^^^^^^^^
+
+error: must be of the form #[wasm_custom_section = "foo"]
+ --> $DIR/malformed.rs:16:1
+ |
+LL | #[wasm_custom_section(foo)] //~ ERROR: must be of the form
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/wasm-custom-section/not-const.rs b/src/test/ui/wasm-custom-section/not-const.rs
new file mode 100644
index 0000000000000..68077fb2fe4ac
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-const.rs
@@ -0,0 +1,29 @@
+// Copyright 2018 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.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+static A: [u8; 2] = [1, 2];
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+struct B {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+enum C {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+impl B {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+mod d {}
+
+#[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/not-const.stderr b/src/test/ui/wasm-custom-section/not-const.stderr
new file mode 100644
index 0000000000000..17c85b3e848eb
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-const.stderr
@@ -0,0 +1,38 @@
+error: only allowed on consts
+ --> $DIR/not-const.rs:13:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+ --> $DIR/not-const.rs:16:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+ --> $DIR/not-const.rs:19:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+ --> $DIR/not-const.rs:22:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+ --> $DIR/not-const.rs:25:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: only allowed on consts
+ --> $DIR/not-const.rs:28:1
+ |
+LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/wasm-custom-section/not-slice.rs b/src/test/ui/wasm-custom-section/not-slice.rs
new file mode 100644
index 0000000000000..2d91641a5f756
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-slice.rs
@@ -0,0 +1,22 @@
+// Copyright 2018 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.
+
+#![feature(wasm_custom_section)]
+
+#[wasm_custom_section = "foo"]
+const A: u8 = 0; //~ ERROR: must be an array of bytes
+
+#[wasm_custom_section = "foo"]
+const B: &[u8] = &[0]; //~ ERROR: must be an array of bytes
+
+#[wasm_custom_section = "foo"]
+const C: &[u8; 1] = &[0]; //~ ERROR: must be an array of bytes
+
+fn main() {}
diff --git a/src/test/ui/wasm-custom-section/not-slice.stderr b/src/test/ui/wasm-custom-section/not-slice.stderr
new file mode 100644
index 0000000000000..f2563ce0dddc1
--- /dev/null
+++ b/src/test/ui/wasm-custom-section/not-slice.stderr
@@ -0,0 +1,20 @@
+error: must be an array of bytes like `[u8; N]`
+ --> $DIR/not-slice.rs:14:1
+ |
+LL | const A: u8 = 0; //~ ERROR: must be an array of bytes
+ | ^^^^^^^^^^^^^^^^
+
+error: must be an array of bytes like `[u8; N]`
+ --> $DIR/not-slice.rs:17:1
+ |
+LL | const B: &[u8] = &[0]; //~ ERROR: must be an array of bytes
+ | ^^^^^^^^^^^^^^^^^^^^^^
+
+error: must be an array of bytes like `[u8; N]`
+ --> $DIR/not-slice.rs:20:1
+ |
+LL | const C: &[u8; 1] = &[0]; //~ ERROR: must be an array of bytes
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/wasm-import-module.rs b/src/test/ui/wasm-import-module.rs
new file mode 100644
index 0000000000000..0b743d9e486b6
--- /dev/null
+++ b/src/test/ui/wasm-import-module.rs
@@ -0,0 +1,20 @@
+// Copyright 2018 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.
+
+#![feature(wasm_import_module)]
+
+#[wasm_import_module] //~ ERROR: must be of the form
+extern {}
+
+#[wasm_import_module = "foo"] //~ ERROR: must only be attached to
+fn foo() {}
+
+fn main() {}
+
diff --git a/src/test/ui/wasm-import-module.stderr b/src/test/ui/wasm-import-module.stderr
new file mode 100644
index 0000000000000..bf301ce5269a7
--- /dev/null
+++ b/src/test/ui/wasm-import-module.stderr
@@ -0,0 +1,14 @@
+error: must be of the form #[wasm_import_module = "..."]
+ --> $DIR/wasm-import-module.rs:13:1
+ |
+LL | #[wasm_import_module] //~ ERROR: must be of the form
+ | ^^^^^^^^^^^^^^^^^^^^^
+
+error: must only be attached to foreign modules
+ --> $DIR/wasm-import-module.rs:16:1
+ |
+LL | #[wasm_import_module = "foo"] //~ ERROR: must only be attached to
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 43220af4893bb..e826c5366a81f 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2396,13 +2396,6 @@ impl<'test> TestCx<'test> {
.env("S", src_root)
.env("RUST_BUILD_STAGE", &self.config.stage_id)
.env("RUSTC", cwd.join(&self.config.rustc_path))
- .env(
- "RUSTDOC",
- cwd.join(&self.config
- .rustdoc_path
- .as_ref()
- .expect("--rustdoc-path passed")),
- )
.env("TMPDIR", &tmpdir)
.env("LD_LIB_PATH_ENVVAR", dylib_env_var())
.env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
@@ -2417,6 +2410,14 @@ impl<'test> TestCx<'test> {
.env_remove("MFLAGS")
.env_remove("CARGO_MAKEFLAGS");
+ if let Some(ref rustdoc) = self.config.rustdoc_path {
+ cmd.env("RUSTDOC", cwd.join(rustdoc));
+ }
+
+ if let Some(ref node) = self.config.nodejs {
+ cmd.env("NODE", node);
+ }
+
if let Some(ref linker) = self.config.linker {
cmd.env("RUSTC_LINKER", linker);
}
@@ -2425,7 +2426,7 @@ impl<'test> TestCx<'test> {
// compiler flags set in the test cases:
cmd.env_remove("RUSTFLAGS");
- if self.config.target.contains("msvc") {
+ if self.config.target.contains("msvc") && self.config.cc != "" {
// We need to pass a path to `lib.exe`, so assume that `cc` is `cl.exe`
// and that `lib.exe` lives next to it.
let lib = Path::new(&self.config.cc).parent().unwrap().join("lib.exe");