diff options
| author | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
|---|---|---|
| committer | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
| commit | 01dbfb3eb264135c432cef223848416f90dac290 (patch) | |
| tree | 67e0a6d5e9a26aa88fe06b38651fe030d994f508 /src/test/codegen | |
| parent | d8e564715e0eb17130e99e8fcc92a36fce7feaf5 (diff) | |
| download | rust-01dbfb3eb264135c432cef223848416f90dac290.tar.gz rust-01dbfb3eb264135c432cef223848416f90dac290.zip | |
resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/catch-unwind.rs | 2 | ||||
| -rw-r--r-- | src/test/codegen/debug-column.rs | 2 |
2 files changed, 2 insertions, 2 deletions
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 |