Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mispositioned span in suggestions with wide characters #47407

Merged
merged 6 commits into from
Jan 17, 2018
Merged

Fix mispositioned span in suggestions with wide characters #47407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cedbfc
fix mispositioned span
gaurikholkar Jan 13, 2018
eb1ada2
revert changes to ui test
gaurikholkar Jan 13, 2018
3c8c505
add ui test
gaurikholkar Jan 13, 2018
d769539
fix tidy checks
gaurikholkar Jan 16, 2018
a4e3f36
using tabs in ui tests
gaurikholkar Jan 16, 2018
efe3d69
fix minor errors
gaurikholkar Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/test/ui/issue-47377-1.stderr
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/test/ui/issue-47377.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn main(){
let b = "hello";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file doesn't use tabs. You need to change the indentation of these two lines to use tabs and then add a line // ignore-tidy-tab to get tidy passing, like done in src/test/ui/codemap_tests/tab_2.rs.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@est31 I changed it to ~^ ERROR E0369 }. Do I still need //ignore-tidy-tab?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ignore-tidy-tab is so that the tidy check for the project doesn't block the merge of the PR, while keeping the tabs in the code so that we avoid regressions in the handling of them. I believe your editor might be "helpfully" replacing tabs with spaces.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it was. Can you have a look now?

let _a = b + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
}
let _a = b + ", World!";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is still using spaces instead of tabs.

//~^ ERROR E0369
}
6 changes: 3 additions & 3 deletions src/test/ui/issue-47377.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
error[E0369]: binary operation `+` cannot be applied to type `&str`
--> $DIR/issue-47377.rs:13:14
--> $DIR/issue-47377.rs:12:14
|
13 | let _a = b + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
12 | let _a = b + ", World!";
| ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings
help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left
|
13 | let _a = b.to_owned() + ", World!"; //~ERROR 13:14: 13:28: binary operation `+` cannot be applied to type `&str` [E0369]
12 | let _a = b.to_owned() + ", World!";
| ^^^^^^^^^^^^

error: aborting due to previous error
Expand Down
7 changes: 4 additions & 3 deletions src/test/ui/issue-47377-1.rs → src/test/ui/issue-47380.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-tidy-tab
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the file that should get this line, the other one should get it with the tabs. Here we are testing for emojis.

fn main(){
let b = "hello";
println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!"; //~ERROR 13:37: 13:51: binary operation `+` cannot be applied to type `&str` [E0369]
}
println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!";
//~^ ERROR E0369
}
12 changes: 12 additions & 0 deletions src/test/ui/issue-47380.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0369]: binary operation `+` cannot be applied to type `&str`
--> $DIR/blah.rs:13:33
|
13 | println!("🦀🦀🦀🦀🦀"); let _a = b + ", World!";
| ^^^^^^^^^^^^^^ `+` can't be used to concatenate two `&str` strings
help: `to_owned()` can be used to create an owned `String` from a string reference. String concatenation appends the string on the right to the string on the left and may require reallocation. This requires ownership of the string on the left
|
13 | println!("🦀🦀🦀🦀🦀"); let _a = b.to_owned() + ", World!";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewers: this looks misaligned on the browser, but not in terminals that handle emojis correctly.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@estebank the output is misaligned in iTerm though

| ^^^^^^^^^^^^

error: aborting due to previous error