mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14598 - lowr:fix/release-channel-from-str, r=lnicola

Browse Source 
Fix release channel detection

We detect toolchain's release channel by looking at pre-release identifier of cargo/rustc's version string. It's empty for stable, "beta" or "beta.x" for beta, and "nightly" for nightly.

See rust-lang/rust's [bootstrap code] for how the version string is determined.

[bootstrap code]: e49122fb1c/src/bootstrap/lib.rs (L1244)
This commit is contained in:
bors 2023-04-17 18:43:47 +00:00
commit b92b7c0d94
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/base-db/src/input.rs
View File

@ -284,9 +284,9 @@ pub fn as_str(self) -> &'static str {
pub fn from_str(str: &str) -> Option<Self> { pub fn from_str(str: &str) -> Option<Self> {
Some(match str { Some(match str {
"stable" => ReleaseChannel::Stable, "" => ReleaseChannel::Stable,
"beta" => ReleaseChannel::Beta,
"nightly" => ReleaseChannel::Nightly, "nightly" => ReleaseChannel::Nightly,
_ if str.starts_with("beta") => ReleaseChannel::Beta,
_ => return None, _ => return None,
}) })
} }

1
crates/ide-completion/src/tests/use_tree.rs
View File

@ -387,7 +387,6 @@ fn bar fn(u32)
fn use_tree_no_unstable_items_on_stable() { fn use_tree_no_unstable_items_on_stable() {
check( check(
r#" r#"
//- toolchain:stable
//- /lib.rs crate:main deps:std //- /lib.rs crate:main deps:std
use std::$0 use std::$0
//- /std.rs crate:std //- /std.rs crate:std

2
crates/project-model/src/workspace.rs
View File

@ -779,7 +779,7 @@ fn project_json_to_crate_graph(
CrateOrigin::Local { repo: None, name: None } CrateOrigin::Local { repo: None, name: None }
}, },
target_layout.clone(), target_layout.clone(),
None, channel,
); );
if *is_proc_macro { if *is_proc_macro {
if let Some(path) = proc_macro_dylib_path.clone() { if let Some(path) = proc_macro_dylib_path.clone() {

5
crates/test-utils/src/fixture.rs
View File

@ -111,8 +111,9 @@ impl FixtureWithProjectMeta {
/// //- minicore: sized /// //- minicore: sized
/// ``` /// ```
/// ///
/// That will include predefined proc macros and a subset of `libcore` into the fixture, see /// That will set toolchain to nightly and include predefined proc macros and a subset of
/// `minicore.rs` for what's available. /// `libcore` into the fixture, see `minicore.rs` for what's available. Note that toolchain
/// defaults to stable.
pub fn parse(ra_fixture: &str) -> Self { pub fn parse(ra_fixture: &str) -> Self {
let fixture = trim_indent(ra_fixture); let fixture = trim_indent(ra_fixture);
let mut fixture = fixture.as_str(); let mut fixture = fixture.as_str();