about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2021-07-09 14:17:39 +0200
committerMara Bos <m-ou.se@m-ou.se>2021-07-28 16:10:43 +0200
commit91d0823dffc29dc3e7b09791469d0c7b8beb2407 (patch)
tree588a9e7d02f32b1deab33f8fd13abaef8c53a387
parentf827d3e2851c97598b9d5c2648dc494ac00ca02f (diff)
downloadrust-91d0823dffc29dc3e7b09791469d0c7b8beb2407.tar.gz
rust-91d0823dffc29dc3e7b09791469d0c7b8beb2407.zip
Update test output for const fmt::Arguments constructor.
-rw-r--r--src/test/ui/borrowck/issue-64453.rs1
-rw-r--r--src/test/ui/borrowck/issue-64453.stderr12
2 files changed, 2 insertions, 11 deletions
diff --git a/src/test/ui/borrowck/issue-64453.rs b/src/test/ui/borrowck/issue-64453.rs
index 3e803f3b6d8..3cfeb86cdc3 100644
--- a/src/test/ui/borrowck/issue-64453.rs
+++ b/src/test/ui/borrowck/issue-64453.rs
@@ -3,7 +3,6 @@ struct Value;
 
 static settings_dir: String = format!("");
 //~^ ERROR calls in statics are limited to constant functions
-//~| ERROR calls in statics are limited to constant functions
 
 fn from_string(_: String) -> Value {
     Value
diff --git a/src/test/ui/borrowck/issue-64453.stderr b/src/test/ui/borrowck/issue-64453.stderr
index bd8270ef958..29b05068ac7 100644
--- a/src/test/ui/borrowck/issue-64453.stderr
+++ b/src/test/ui/borrowck/issue-64453.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of static item `settings_dir`
-  --> $DIR/issue-64453.rs:14:37
+  --> $DIR/issue-64453.rs:13:37
    |
 LL |     let settings_data = from_string(settings_dir);
    |                                     ^^^^^^^^^^^^ move occurs because `settings_dir` has type `String`, which does not implement the `Copy` trait
@@ -10,17 +10,9 @@ error[E0015]: calls in statics are limited to constant functions, tuple structs
 LL | static settings_dir: String = format!("");
    |                               ^^^^^^^^^^^
    |
-   = note: this error originates in the macro `$crate::__export::format_args` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0015]: calls in statics are limited to constant functions, tuple structs and tuple variants
-  --> $DIR/issue-64453.rs:4:31
-   |
-LL | static settings_dir: String = format!("");
-   |                               ^^^^^^^^^^^
-   |
    = note: this error originates in the macro `format` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 Some errors have detailed explanations: E0015, E0507.
 For more information about an error, try `rustc --explain E0015`.