mirror of
https://github.com/helix-editor/helix.git
synced 2024-09-11 18:58:00 +03:00
bump MSRV to 1.70.0 (#8877)
* rust-toolchain.toml: bump MSRV to 1.70.0 With Firefox 120 released on 21 November 2023, the MSRV is now 1.70.0. * Fix cargo fmt with Rust 1.70.0 * Fix cargo clippy with Rust 1.70.0 * Fix cargo doc with Rust 1.70.0 * rust-toolchain.toml: add clippy component * .github: bump dtolnay/rust-toolchain to 1.70 * helix-term: bump rust-version to 1.70 * helix-view/gutter: use checked_ilog10 to count digits * helix-core/syntax: use MAIN_SEPARATOR_STR constant * helix-view/handlers/dap: use Display impl for displaying process spawn error * WIP: helix-term/commands: use checked math to assert ranges cannot overlap
This commit is contained in:
parent
090ed97e00
commit
8b0ae3d279
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install stable toolchain
|
||||
uses: dtolnay/rust-toolchain@1.65
|
||||
uses: dtolnay/rust-toolchain@1.70
|
||||
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
with:
|
||||
@ -70,7 +70,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install stable toolchain
|
||||
uses: dtolnay/rust-toolchain@1.65
|
||||
uses: dtolnay/rust-toolchain@1.70
|
||||
with:
|
||||
components: rustfmt, clippy
|
||||
|
||||
@ -97,7 +97,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install stable toolchain
|
||||
uses: dtolnay/rust-toolchain@1.65
|
||||
uses: dtolnay/rust-toolchain@1.70
|
||||
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
with:
|
||||
|
@ -212,10 +212,7 @@ fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
|
||||
{
|
||||
match map.next_entry::<String, String>()? {
|
||||
Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
|
||||
// FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
|
||||
// if MSRV is updated to 1.68
|
||||
let mut separator = [0; 1];
|
||||
suffix.replace('/', std::path::MAIN_SEPARATOR.encode_utf8(&mut separator))
|
||||
suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
|
||||
})),
|
||||
Some((key, _value)) => Err(serde::de::Error::custom(format!(
|
||||
"unknown key in `file-types` list: {}",
|
||||
|
@ -10,7 +10,7 @@ repository = "https://github.com/helix-editor/helix"
|
||||
homepage = "https://helix-editor.com"
|
||||
include = ["src/**/*", "README.md"]
|
||||
default-run = "hx"
|
||||
rust-version = "1.65"
|
||||
rust-version = "1.70"
|
||||
|
||||
[features]
|
||||
default = ["git"]
|
||||
|
@ -1318,7 +1318,7 @@ fn extend_next_long_word_end(cx: &mut Context) {
|
||||
extend_word_impl(cx, movement::move_next_long_word_end)
|
||||
}
|
||||
|
||||
/// Separate branch to find_char designed only for <ret> char.
|
||||
/// Separate branch to find_char designed only for `<ret>` char.
|
||||
//
|
||||
// This is necessary because the one document can have different line endings inside. And we
|
||||
// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
|
||||
@ -5606,12 +5606,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
|
||||
};
|
||||
|
||||
// These `usize`s cannot underflow because selection ranges cannot overlap.
|
||||
// Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
|
||||
// arithmetic to assert this.
|
||||
let anchor = (to as isize + offset - deleted_len as isize) as usize;
|
||||
let anchor = to
|
||||
.checked_add_signed(offset)
|
||||
.expect("Selection ranges cannot overlap")
|
||||
.checked_sub(deleted_len)
|
||||
.expect("Selection ranges cannot overlap");
|
||||
let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
|
||||
ranges.push(new_range);
|
||||
offset = offset + output_len as isize - deleted_len as isize;
|
||||
offset = offset
|
||||
.checked_add_unsigned(output_len)
|
||||
.expect("Selection ranges cannot overlap")
|
||||
.checked_sub_unsigned(deleted_len)
|
||||
.expect("Selection ranges cannot overlap");
|
||||
|
||||
changes.push((from, to, Some(output)));
|
||||
}
|
||||
|
@ -49,7 +49,7 @@
|
||||
/// If there is no configured language server that supports the feature, this displays a status message.
|
||||
/// Using this macro in a context where the editor automatically queries the LSP
|
||||
/// (instead of when the user explicitly does so via a keybind like `gd`)
|
||||
/// will spam the "No configured language server supports <feature>" status message confusingly.
|
||||
/// will spam the "No configured language server supports \<feature>" status message confusingly.
|
||||
#[macro_export]
|
||||
macro_rules! language_server_with_feature {
|
||||
($editor:expr, $doc:expr, $feature:expr) => {{
|
||||
|
@ -213,7 +213,7 @@ pub fn in_bounds(&self, x: u16, y: u16) -> bool {
|
||||
&& y < self.area.bottom()
|
||||
}
|
||||
|
||||
/// Returns the index in the Vec<Cell> for the given global (x, y) coordinates.
|
||||
/// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates.
|
||||
///
|
||||
/// Global coordinates are offset by the Buffer's area offset (`x`/`y`).
|
||||
///
|
||||
@ -242,7 +242,7 @@ pub fn index_of(&self, x: u16, y: u16) -> usize {
|
||||
((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
|
||||
}
|
||||
|
||||
/// Returns the index in the Vec<Cell> for the given global (x, y) coordinates,
|
||||
/// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates,
|
||||
/// or `None` if the coordinates are outside the buffer's area.
|
||||
fn index_of_opt(&self, x: u16, y: u16) -> Option<usize> {
|
||||
if self.in_bounds(x, y) {
|
||||
|
@ -755,12 +755,13 @@ fn default() -> Self {
|
||||
}
|
||||
|
||||
/// Line ending configuration.
|
||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum LineEndingConfig {
|
||||
/// The platform's native line ending.
|
||||
///
|
||||
/// `crlf` on Windows, otherwise `lf`.
|
||||
#[default]
|
||||
Native,
|
||||
/// Line feed.
|
||||
LF,
|
||||
@ -777,12 +778,6 @@ pub enum LineEndingConfig {
|
||||
Nel,
|
||||
}
|
||||
|
||||
impl Default for LineEndingConfig {
|
||||
fn default() -> Self {
|
||||
LineEndingConfig::Native
|
||||
}
|
||||
}
|
||||
|
||||
impl From<LineEndingConfig> for LineEnding {
|
||||
fn from(line_ending: LineEndingConfig) -> Self {
|
||||
match line_ending {
|
||||
|
@ -9,8 +9,7 @@
|
||||
};
|
||||
|
||||
fn count_digits(n: usize) -> usize {
|
||||
// TODO: use checked_log10 when MSRV reaches 1.67
|
||||
std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count()
|
||||
(usize::checked_ilog10(n).unwrap_or(0) + 1) as usize
|
||||
}
|
||||
|
||||
pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
|
||||
|
@ -369,9 +369,7 @@ pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) ->
|
||||
{
|
||||
Ok(process) => process,
|
||||
Err(err) => {
|
||||
// TODO replace the pretty print {:?} with a regular format {}
|
||||
// when the MSRV is raised to 1.60.0
|
||||
self.set_error(format!("Error starting external terminal: {:?}", err));
|
||||
self.set_error(format!("Error starting external terminal: {}", err));
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
@ -1,3 +1,3 @@
|
||||
[toolchain]
|
||||
channel = "1.65.0"
|
||||
components = ["rustfmt", "rust-src"]
|
||||
channel = "1.70.0"
|
||||
components = ["rustfmt", "rust-src", "clippy"]
|
||||
|
Loading…
Reference in New Issue
Block a user