Skip to content

Commit

Permalink
Auto merge of #78047 - khyperia:set_span_mut, r=bjorn3
Browse files Browse the repository at this point in the history
Make set_span take mut self

This was a mistake in #77614

It's not a _huge_ deal, because backends can always implement this with interior mutability, but it's nice to avoid interior mutability when possible. For context, the `set_source_location` method, called alongside `set_span`, also takes `&mut self`.

r? `@eddyb`
  • Loading branch information
bors committed Oct 18, 2020
2 parents c38ddb8 + 3d48448 commit 94332bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_llvm/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
unsafe { llvm::LLVMGetInsertBlock(self.llbuilder) }
}

fn set_span(&self, _span: Span) {}
fn set_span(&mut self, _span: Span) {}

fn position_at_end(&mut self, llbb: &'ll BasicBlock) {
unsafe {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/src/traits/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub trait BuilderMethods<'a, 'tcx>:
fn build_sibling_block(&self, name: &str) -> Self;
fn cx(&self) -> &Self::CodegenCx;
fn llbb(&self) -> Self::BasicBlock;
fn set_span(&self, span: Span);
fn set_span(&mut self, span: Span);

fn position_at_end(&mut self, llbb: Self::BasicBlock);
fn ret_void(&mut self);
Expand Down

0 comments on commit 94332bb

Please sign in to comment.