about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorKurtis Nusbaum <kcommiter@gmail.com>2018-03-14 20:30:06 -0700
committerKurtis Nusbaum <kcommiter@gmail.com>2018-03-20 10:27:02 -0700
commit3c8d55549728ec117fb6e3de93ce3d96fb6622d4 (patch)
tree964a6f9b52a6c83f82a5bcb22bd7b34860827637 /src/test/ui
parent75af15ee6ca0c12b699a17984b033363cd25e9c3 (diff)
downloadrust-3c8d55549728ec117fb6e3de93ce3d96fb6622d4.tar.gz
rust-3c8d55549728ec117fb6e3de93ce3d96fb6622d4.zip
rename epoch to edition
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/inference-variable-behind-raw-pointer.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference-variable-behind-raw-pointer.stderr
index eb40151615d..fe6dc0b0748 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>