about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-16 06:50:43 +0000
committerbors <bors@rust-lang.org>2023-07-16 06:50:43 +0000
commit4fad3301b195a4d17e4b33485fc94f70459c331e (patch)
treef275a41f6916d5916dc61c736deabcc24c4f629c
parentf4b5c7c8bde381c6f9e63666387c73ba539cffb9 (diff)
parent424da1007711796e5748da1ac15573d89f147f4e (diff)
downloadrust-4fad3301b195a4d17e4b33485fc94f70459c331e.tar.gz
rust-4fad3301b195a4d17e4b33485fc94f70459c331e.zip
Auto merge of #15280 - lnicola:bump-rust-version, r=lnicola
minor: Bump rust-version to 1.70 and use the workspace one in xtask

CC https://github.com/rust-lang/rust-analyzer/issues/15279
-rw-r--r--Cargo.toml2
-rw-r--r--xtask/Cargo.toml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 24889fc1421..f6a50bfa6b2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ exclude = ["crates/proc-macro-test/imp"]
 resolver = "2"
 
 [workspace.package]
-rust-version = "1.66"
+rust-version = "1.70"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 authors = ["rust-analyzer team"]
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index b4b294c3099..7a34617e255 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 publish = false
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.65"
+rust-version.workspace = true
 
 [dependencies]
 anyhow = "1.0.62"