From 24b74b27443192f6d440be10f7aa0617d8003fab Mon Sep 17 00:00:00 2001 From: ljedrz Date: Tue, 16 Oct 2018 11:14:10 +0200 Subject: [PATCH] end return statements and void expressions with a semicolon --- src/librustc_codegen_llvm/debuginfo/metadata.rs | 10 +++++----- src/librustc_codegen_llvm/debuginfo/source_loc.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs index 6dcca65a73601..163a8b91f4c4f 100644 --- a/src/librustc_codegen_llvm/debuginfo/metadata.rs +++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs @@ -164,7 +164,7 @@ impl TypeMap<'ll, 'tcx> { type_: Ty<'tcx>) -> UniqueTypeId { // Let's see if we already have something in the cache if let Some(unique_type_id) = self.type_to_unique_id.get(&type_).cloned() { - return unique_type_id + return unique_type_id; } // if not, generate one @@ -290,7 +290,7 @@ macro_rules! return_if_metadata_created_in_meantime { .borrow() .find_metadata_for_unique_id($unique_type_id) { - return MetadataCreationResult::new(metadata, true) + return MetadataCreationResult::new(metadata, true); } ) } @@ -552,7 +552,7 @@ pub fn type_metadata( .borrow() .find_metadata_for_unique_id(unique_type_id) { - return Err(metadata) + return Err(metadata); } Ok(MetadataCreationResult::new(pointer_type_metadata(cx, t, pointee_metadata), @@ -612,7 +612,7 @@ pub fn type_metadata( .borrow() .find_metadata_for_unique_id(unique_type_id) { - return metadata + return metadata; } // This is actually a function pointer, so wrap it in pointer DI @@ -1477,7 +1477,7 @@ fn prepare_enum_metadata( }; if let (&layout::Abi::Scalar(_), Some(discr)) = (&layout.abi, discriminant_type_metadata) { - return FinalMetadata(discr) + return FinalMetadata(discr); } let (enum_type_size, enum_type_align) = layout.size_and_align(); diff --git a/src/librustc_codegen_llvm/debuginfo/source_loc.rs b/src/librustc_codegen_llvm/debuginfo/source_loc.rs index 405cffdefa285..60ebcb888166f 100644 --- a/src/librustc_codegen_llvm/debuginfo/source_loc.rs +++ b/src/librustc_codegen_llvm/debuginfo/source_loc.rs @@ -57,7 +57,7 @@ pub fn set_source_location( /// first real statement/expression of the function is codegened. pub fn start_emitting_source_locations(dbg_context: &FunctionDebugContext<'ll>) { if let FunctionDebugContext::RegularContext(ref data) = *dbg_context { - data.source_locations_enabled.set(true) + data.source_locations_enabled.set(true); } }