language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-21 11:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove lifetime from FormatContext (#4376)

Browse source
This commit is contained in:
Micha Reiser 2023-05-11 17:43:42 +02:00 • committed by GitHub
parent 6a52577630
commit 1ccef5150d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 124 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ruff_python_formatter/src/context.rs
View file

@ -3,23 +3,21 @@ use std::rc::Rc;
use ruff_formatter::{FormatContext, SimpleFormatOptions};
use ruff_python_ast::source_code::Locator;
pub struct ASTFormatContext<'a> {
pub struct ASTFormatContext {
options: SimpleFormatOptions,
contents: Rc<str>,
locator: Locator<'a>,
}
impl<'a> ASTFormatContext<'a> {
pub fn new(options: SimpleFormatOptions, locator: Locator<'a>) -> Self {
impl ASTFormatContext {
pub fn new(options: SimpleFormatOptions, contents: &str) -> Self {
Self {
options,
contents: Rc::from(locator.contents()),
locator,
contents: Rc::from(contents),
}
}
}
impl FormatContext for ASTFormatContext<'_> {
impl FormatContext for ASTFormatContext {
type Options = SimpleFormatOptions;
fn options(&self) -> &Self::Options {
@ -27,12 +25,12 @@ impl FormatContext for ASTFormatContext<'_> {
}
}
impl<'a> ASTFormatContext<'a> {
pub fn contents(&'a self) -> Rc<str> {
impl ASTFormatContext {
pub fn contents(&self) -> Rc<str> {
self.contents.clone()
}
pub fn locator(&'a self) -> &'a Locator {
&self.locator
pub fn locator(&self) -> Locator {
Locator::new(&self.contents)
}
}