From 01dbfb3eb264135c432cef223848416f90dac290 Mon Sep 17 00:00:00 2001 From: codehorseman Date: Wed, 16 Mar 2022 20:12:30 +0800 Subject: resolve the conflict in compiler/rustc_session/src/parse.rs Signed-off-by: codehorseman --- src/test/codegen/catch-unwind.rs | 2 +- src/test/codegen/debug-column.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/codegen') diff --git a/src/test/codegen/catch-unwind.rs b/src/test/codegen/catch-unwind.rs index b89c590add0..3ea3a24bfae 100644 --- a/src/test/codegen/catch-unwind.rs +++ b/src/test/codegen/catch-unwind.rs @@ -1,6 +1,6 @@ // compile-flags: -O -// On x86 the closure is inlined in foo() producting something like +// On x86 the closure is inlined in foo() producing something like // define i32 @foo() [...] { // tail call void @bar() [...] // ret i32 0 diff --git a/src/test/codegen/debug-column.rs b/src/test/codegen/debug-column.rs index 5d3afef5289..e61642b8e1b 100644 --- a/src/test/codegen/debug-column.rs +++ b/src/test/codegen/debug-column.rs @@ -1,4 +1,4 @@ -// Verify that debuginfo column nubmers are 1-based byte offsets. +// Verify that debuginfo column numbers are 1-based byte offsets. // // ignore-windows // compile-flags: -C debuginfo=2 -- cgit 1.4.1-3-g733a5