Skip to content

Simplify #4856

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

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Simplify #4856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions crates/ra_syntax/src/ast/tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl Whitespace {
}

pub struct QuoteOffsets {
pub quotes: [TextRange; 2],
pub quotes: (TextRange, TextRange),
pub contents: TextRange,
}

Expand All @@ -103,7 +103,7 @@ impl QuoteOffsets {
let end = TextSize::of(literal);

let res = QuoteOffsets {
quotes: [TextRange::new(start, left_quote), TextRange::new(right_quote, end)],
quotes: (TextRange::new(start, left_quote), TextRange::new(right_quote, end)),
contents: TextRange::new(left_quote, right_quote),
};
Some(res)
Expand All @@ -116,17 +116,17 @@ pub trait HasQuotes: AstToken {
let offsets = QuoteOffsets::new(text)?;
let o = self.syntax().text_range().start();
let offsets = QuoteOffsets {
quotes: [offsets.quotes[0] + o, offsets.quotes[1] + o],
quotes: (offsets.quotes.0 + o, offsets.quotes.1 + o),
contents: offsets.contents + o,
};
Some(offsets)
}
fn open_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes[0])
self.quote_offsets().map(|it| it.quotes.0)
}

fn close_quote_text_range(&self) -> Option<TextRange> {
self.quote_offsets().map(|it| it.quotes[1])
self.quote_offsets().map(|it| it.quotes.1)
}

fn text_range_between_quotes(&self) -> Option<TextRange> {
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/codegen/gen_syntax.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn generate_nodes(kinds: KindsSrc<'_>, grammar: AstSrc<'_>) -> Result<String> {
.iter()
.map(|node| {
let name = format_ident!("{}", node.name);
let kind = format_ident!("{}", to_upper_snake_case(&name.to_string()));
let kind = format_ident!("{}", to_upper_snake_case(node.name));
let traits = node.traits.iter().map(|trait_name| {
let trait_name = format_ident!("{}", trait_name);
quote!(impl ast::#trait_name for #name {})
Expand Down