diff options
| author | bors <bors@rust-lang.org> | 2016-11-30 23:40:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-11-30 23:40:10 +0000 |
| commit | dc81742b1869001e1926f130623eb5b8cf16e7a9 (patch) | |
| tree | f1f49d84eb65fb9fd3b15750563caaad59260870 /src | |
| parent | ecff71a45c9d1aff9ba5dbc212cb1353578525ee (diff) | |
| parent | 246edb8628cb4df26e37ef42a50ee076b9e21ff4 (diff) | |
| download | rust-dc81742b1869001e1926f130623eb5b8cf16e7a9.tar.gz rust-dc81742b1869001e1926f130623eb5b8cf16e7a9.zip | |
Auto merge of #38047 - canndrew:fmt-void-non-empty, r=bluss
Make core::fmt::Void a non-empty type. Adding back this change that was removed from PR #36449 because it's a fix and because I immediately hit a problem with it again when I started implementing my fix for #12609.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/fmt/mod.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 2d75a8ec420..9167264ba9d 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -166,7 +166,9 @@ pub struct Formatter<'a> { // NB. Argument is essentially an optimized partially applied formatting function, // equivalent to `exists T.(&T, fn(&T, &mut Formatter) -> Result`. -enum Void {} +struct Void { + _priv: (), +} /// This struct represents the generic "argument" which is taken by the Xprintf /// family of functions. It contains a function to format the given value. At |