bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

end return statements and void expressions with a semicolon

Browse source
This commit is contained in:
ljedrz 2018-10-16 11:14:10 +02:00
parent fa81576023
commit 24b74b2744
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc_codegen_llvm/debuginfo/metadata.rs
View file

@ -164,7 +164,7 @@ impl TypeMap<'ll, 'tcx> {
type_: Ty<'tcx>) -> UniqueTypeId { type_: Ty<'tcx>) -> UniqueTypeId {
// Let's see if we already have something in the cache // 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() { 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 // if not, generate one
@ -290,7 +290,7 @@ macro_rules! return_if_metadata_created_in_meantime {
.borrow() .borrow()
.find_metadata_for_unique_id($unique_type_id) .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() .borrow()
.find_metadata_for_unique_id(unique_type_id) .find_metadata_for_unique_id(unique_type_id)
{ {
return Err(metadata) return Err(metadata);
} }
Ok(MetadataCreationResult::new(pointer_type_metadata(cx, t, pointee_metadata), Ok(MetadataCreationResult::new(pointer_type_metadata(cx, t, pointee_metadata),
@ -612,7 +612,7 @@ pub fn type_metadata(
.borrow() .borrow()
.find_metadata_for_unique_id(unique_type_id) .find_metadata_for_unique_id(unique_type_id)
{ {
return metadata return metadata;
} }
// This is actually a function pointer, so wrap it in pointer DI // 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) { 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(); let (enum_type_size, enum_type_align) = layout.size_and_align();

2
src/librustc_codegen_llvm/debuginfo/source_loc.rs
View file

@ -57,7 +57,7 @@ pub fn set_source_location(
/// first real statement/expression of the function is codegened. /// first real statement/expression of the function is codegened.
pub fn start_emitting_source_locations(dbg_context: &FunctionDebugContext<'ll>) { pub fn start_emitting_source_locations(dbg_context: &FunctionDebugContext<'ll>) {
if let FunctionDebugContext::RegularContext(ref data) = *dbg_context { if let FunctionDebugContext::RegularContext(ref data) = *dbg_context {
data.source_locations_enabled.set(true) data.source_locations_enabled.set(true);
} }
} }