Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dtolnay/rustversion
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.15
Choose a base ref
...
head repository: dtolnay/rustversion
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.17
Choose a head ref
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on May 7, 2024

  1. Resolve unexpected_cfgs warning 

        warning: unexpected `cfg` condition name: `cfg_macro_not_allowed`
       --> src/lib.rs:235:11
        |
    235 | #[cfg(not(cfg_macro_not_allowed))]
        |           ^^^^^^^^^^^^^^^^^^^^^
        |
        = help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, `windows`
        = help: consider using a Cargo feature instead or adding `println!("cargo::rustc-check-cfg=cfg(cfg_macro_not_allowed)");` to the top of the `build.rs`
        = note: see <https://doc.rust-lang.org/nightly/cargo/reference/build-scripts.html#rustc-check-cfg> for more information about checking conditional configuration
        = note: `#[warn(unexpected_cfgs)]` on by default
    @dtolnay
    dtolnay committed May 7, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    dtolnay David Tolnay
    GPG key ID: F9BA143B95FF6D82
    Verified
    Learn about vigilant mode
    Copy the full SHA
    84f01fa View commit details

  2. Merge pull request #48 from dtolnay/checkcfg 

    Resolve unexpected_cfgs warning
    @dtolnay
    dtolnay authored May 7, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    746bf5a View commit details

  3. Release 1.0.16

    @dtolnay
    dtolnay committed May 7, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    dtolnay David Tolnay
    GPG key ID: F9BA143B95FF6D82
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c7bc274 View commit details

Commits on May 14, 2024

  1. Support OUT_DIR located in \\?\ path on Windows

    @dtolnay
    dtolnay committed May 14, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    dtolnay David Tolnay
    GPG key ID: F9BA143B95FF6D82
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cfafcd5 View commit details

  2. Merge pull request #51 from dtolnay/windows 

    Support OUT_DIR located in `\\?\` path on Windows
    @dtolnay
    dtolnay authored May 14, 2024
    Loading
    Loading status checks…

    Verified

    This commit was created on github.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8759820 View commit details

  3. Release 1.0.17

    @dtolnay
    dtolnay committed May 14, 2024
    Loading
    Loading status checks…

    Verified

    This commit was signed with the committer’s verified signature.
    dtolnay David Tolnay
    GPG key ID: F9BA143B95FF6D82
    Verified
    Learn about vigilant mode
    Copy the full SHA
    adb11fa View commit details
Showing with 16 additions and 2 deletions.
  1. +1 −1 Cargo.toml
  2. +10 −0 build/build.rs
  3. +5 −1 src/lib.rs
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustversion"
version = "1.0.15"
version = "1.0.17"
authors = ["David Tolnay <dtolnay@gmail.com>"]
build = "build/build.rs"
categories = ["development-tools::build-utils", "no-std", "no-std::no-alloc"]
10 changes: 10 additions & 0 deletions build/build.rs
View file
Original file line number Diff line number Diff line change
@@ -73,8 +73,18 @@ fn main() {
println!("cargo:rustc-cfg=cfg_macro_not_allowed");
}

if version.minor >= 80 {
println!("cargo:rustc-check-cfg=cfg(cfg_macro_not_allowed)");
println!("cargo:rustc-check-cfg=cfg(host_os, values(\"windows\"))");
}

let version = format!("{:#?}\n", version);
let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR not set");
let out_file = Path::new(&out_dir).join("version.expr");
fs::write(out_file, version).expect("failed to write version.expr");

let host = env::var_os("HOST").expect("HOST not set");
if let Some("windows") = host.to_str().unwrap().split('-').nth(2) {
println!("cargo:rustc-cfg=host_os=\"windows\"");
}
}
6 changes: 5 additions & 1 deletion src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@
//!
//! <br>
#![doc(html_root_url = "https://docs.rs/rustversion/1.0.15")]
#![doc(html_root_url = "https://docs.rs/rustversion/1.0.17")]
#![allow(
clippy::cast_lossless,
clippy::cast_possible_truncation,
@@ -183,8 +183,12 @@ use crate::error::Error;
use crate::version::Version;
use proc_macro::TokenStream;

#[cfg(not(host_os = "windows"))]
const RUSTVERSION: Version = include!(concat!(env!("OUT_DIR"), "/version.expr"));

#[cfg(host_os = "windows")]
const RUSTVERSION: Version = include!(concat!(env!("OUT_DIR"), "\\version.expr"));

#[proc_macro_attribute]
pub fn stable(args: TokenStream, input: TokenStream) -> TokenStream {
expand::cfg("stable", args, input)