about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2020-03-23 19:04:55 +0100
committerGitHub <noreply@github.com>2020-03-23 19:04:55 +0100
commit176e2eb2716c16c1f3be216c89cbbdd604c8cc90 (patch)
tree97680af3b456834565c834e116d652329602d48b
parent1bb0c929cb6e6c4eb316c0308b80f99c9956c11f (diff)
parent403ba610c8d5f067f840a1a485d0fd32b19c79a9 (diff)
downloadrust-176e2eb2716c16c1f3be216c89cbbdd604c8cc90.tar.gz
rust-176e2eb2716c16c1f3be216c89cbbdd604c8cc90.zip
Rollup merge of #70315 - anyska:void-rename, r=Mark-Simulacrum
Rename remaining occurences of Void to Opaque.

Two mentions of the type were missed when the type was renamed.
-rw-r--r--src/libcore/fmt/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index a93b34fc46c..fe728d42c76 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -282,10 +282,10 @@ impl<'a> ArgumentV1<'a> {
         // SAFETY: `mem::transmute(x)` is safe because
         //     1. `&'b T` keeps the lifetime it originated with `'b`
         //              (so as to not have an unbounded lifetime)
-        //     2. `&'b T` and `&'b Void` have the same memory layout
+        //     2. `&'b T` and `&'b Opaque` have the same memory layout
         //              (when `T` is `Sized`, as it is here)
         // `mem::transmute(f)` is safe since `fn(&T, &mut Formatter<'_>) -> Result`
-        // and `fn(&Void, &mut Formatter<'_>) -> Result` have the same ABI
+        // and `fn(&Opaque, &mut Formatter<'_>) -> Result` have the same ABI
         // (as long as `T` is `Sized`)
         unsafe { ArgumentV1 { formatter: mem::transmute(f), value: mem::transmute(x) } }
     }