mirror of
https://github.com/ilyakooo0/helix.git
synced 2024-11-28 04:12:25 +03:00
Fix clippy 1.67 warnings (#5697)
This commit is contained in:
parent
4d548a0ee3
commit
d2d3024337
@ -14,7 +14,7 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
|
|||||||
.chain([crate::config_dir()].into_iter())
|
.chain([crate::config_dir()].into_iter())
|
||||||
.map(|path| path.join("languages.toml"))
|
.map(|path| path.join("languages.toml"))
|
||||||
.filter_map(|file| {
|
.filter_map(|file| {
|
||||||
std::fs::read_to_string(&file)
|
std::fs::read_to_string(file)
|
||||||
.map(|config| toml::from_str(&config))
|
.map(|config| toml::from_str(&config))
|
||||||
.ok()
|
.ok()
|
||||||
})
|
})
|
||||||
|
@ -515,5 +515,5 @@ pub fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::
|
|||||||
.join("queries")
|
.join("queries")
|
||||||
.join(language)
|
.join(language)
|
||||||
.join(filename);
|
.join(filename);
|
||||||
std::fs::read_to_string(&path)
|
std::fs::read_to_string(path)
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,7 @@ impl<T: Item> Menu<T> {
|
|||||||
Self {
|
Self {
|
||||||
options,
|
options,
|
||||||
editor_data,
|
editor_data,
|
||||||
matcher: Box::new(Matcher::default()),
|
matcher: Box::default(),
|
||||||
matches,
|
matches,
|
||||||
cursor: None,
|
cursor: None,
|
||||||
widths: Vec::new(),
|
widths: Vec::new(),
|
||||||
|
@ -431,7 +431,7 @@ impl<T: Item> Picker<T> {
|
|||||||
let mut picker = Self {
|
let mut picker = Self {
|
||||||
options,
|
options,
|
||||||
editor_data,
|
editor_data,
|
||||||
matcher: Box::new(Matcher::default()),
|
matcher: Box::default(),
|
||||||
matches: Vec::new(),
|
matches: Vec::new(),
|
||||||
cursor: 0,
|
cursor: 0,
|
||||||
prompt,
|
prompt,
|
||||||
|
@ -433,7 +433,7 @@ impl Buffer {
|
|||||||
(x_offset as u16, y)
|
(x_offset as u16, y)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_spans<'a>(&mut self, x: u16, y: u16, spans: &Spans<'a>, width: u16) -> (u16, u16) {
|
pub fn set_spans(&mut self, x: u16, y: u16, spans: &Spans, width: u16) -> (u16, u16) {
|
||||||
let mut remaining_width = width;
|
let mut remaining_width = width;
|
||||||
let mut x = x;
|
let mut x = x;
|
||||||
for span in &spans.0 {
|
for span in &spans.0 {
|
||||||
@ -454,7 +454,7 @@ impl Buffer {
|
|||||||
(x, y)
|
(x, y)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_span<'a>(&mut self, x: u16, y: u16, span: &Span<'a>, width: u16) -> (u16, u16) {
|
pub fn set_span(&mut self, x: u16, y: u16, span: &Span, width: u16) -> (u16, u16) {
|
||||||
self.set_stringn(x, y, span.content.as_ref(), width as usize, span.style)
|
self.set_stringn(x, y, span.content.as_ref(), width as usize, span.style)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -521,10 +521,10 @@ impl Buffer {
|
|||||||
pub fn merge(&mut self, other: &Buffer) {
|
pub fn merge(&mut self, other: &Buffer) {
|
||||||
let area = self.area.union(other.area);
|
let area = self.area.union(other.area);
|
||||||
let cell: Cell = Default::default();
|
let cell: Cell = Default::default();
|
||||||
self.content.resize(area.area() as usize, cell.clone());
|
self.content.resize(area.area(), cell.clone());
|
||||||
|
|
||||||
// Move original content to the appropriate space
|
// Move original content to the appropriate space
|
||||||
let size = self.area.area() as usize;
|
let size = self.area.area();
|
||||||
for i in (0..size).rev() {
|
for i in (0..size).rev() {
|
||||||
let (x, y) = self.pos_of(i);
|
let (x, y) = self.pos_of(i);
|
||||||
// New index in content
|
// New index in content
|
||||||
@ -537,7 +537,7 @@ impl Buffer {
|
|||||||
|
|
||||||
// Push content of the other buffer into this one (may erase previous
|
// Push content of the other buffer into this one (may erase previous
|
||||||
// data)
|
// data)
|
||||||
let size = other.area.area() as usize;
|
let size = other.area.area();
|
||||||
for i in 0..size {
|
for i in 0..size {
|
||||||
let (x, y) = other.pos_of(i);
|
let (x, y) = other.pos_of(i);
|
||||||
// New index in content
|
// New index in content
|
||||||
|
@ -150,7 +150,7 @@ impl Loader {
|
|||||||
|
|
||||||
// Loads the theme data as `toml::Value` first from the user_dir then in default_dir
|
// Loads the theme data as `toml::Value` first from the user_dir then in default_dir
|
||||||
fn load_toml(&self, path: PathBuf) -> Result<Value> {
|
fn load_toml(&self, path: PathBuf) -> Result<Value> {
|
||||||
let data = std::fs::read_to_string(&path)?;
|
let data = std::fs::read_to_string(path)?;
|
||||||
let value = toml::from_str(&data)?;
|
let value = toml::from_str(&data)?;
|
||||||
|
|
||||||
Ok(value)
|
Ok(value)
|
||||||
|
Loading…
Reference in New Issue
Block a user