summary refs log tree commit diff
path: root/compiler/rustc_span/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-11-07 20:04:54 +0000
committerbors <bors@rust-lang.org>2021-11-07 20:04:54 +0000
commit46b8e7488eae116722196e8390c1bd2ea2e396cf (patch)
tree4d9b19012744e2bcb59dd6d2c61be9ebcebc12b6 /compiler/rustc_span/src
parent68568dcb8ff49a3d70f4cc2d9215b5753d088738 (diff)
parent5c454551dae45563e7a33da7142377cf7d8dbcbf (diff)
downloadrust-46b8e7488eae116722196e8390c1bd2ea2e396cf.tar.gz
rust-46b8e7488eae116722196e8390c1bd2ea2e396cf.zip
Auto merge of #90668 - matthiaskrgr:clippy_nov7, r=jyn514
more clippy fixes
Diffstat (limited to 'compiler/rustc_span/src')
-rw-r--r--compiler/rustc_span/src/lib.rs15
1 files changed, 5 insertions, 10 deletions
diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs
index 032ae73bbf3..dfc64f37e4c 100644
--- a/compiler/rustc_span/src/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
@@ -194,10 +194,8 @@ impl<S: Encoder> Encodable<S> for RealFileName {
         encoder.emit_enum(|encoder| match *self {
             RealFileName::LocalPath(ref local_path) => {
                 encoder.emit_enum_variant("LocalPath", 0, 1, |encoder| {
-                    Ok({
-                        encoder
-                            .emit_enum_variant_arg(true, |encoder| local_path.encode(encoder))?;
-                    })
+                    encoder.emit_enum_variant_arg(true, |encoder| local_path.encode(encoder))?;
+                    Ok(())
                 })
             }
 
@@ -206,12 +204,9 @@ impl<S: Encoder> Encodable<S> for RealFileName {
                     // For privacy and build reproducibility, we must not embed host-dependant path in artifacts
                     // if they have been remapped by --remap-path-prefix
                     assert!(local_path.is_none());
-                    Ok({
-                        encoder
-                            .emit_enum_variant_arg(true, |encoder| local_path.encode(encoder))?;
-                        encoder
-                            .emit_enum_variant_arg(false, |encoder| virtual_name.encode(encoder))?;
-                    })
+                    encoder.emit_enum_variant_arg(true, |encoder| local_path.encode(encoder))?;
+                    encoder.emit_enum_variant_arg(false, |encoder| virtual_name.encode(encoder))?;
+                    Ok(())
                 }),
         })
     }