Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sqlx-macros-core/clippy.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[[disallowed-methods]]
path = "std::env::var"
reason = "use `crate::env()` instead, which optionally calls `proc_macro::tracked_env::var()`"
reason = "use `crate::env()` instead, which optionally calls `proc_macro::tracked::env_var()`"
7 changes: 5 additions & 2 deletions sqlx-macros-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@

#![cfg_attr(
any(sqlx_macros_unstable, procmacro2_semver_exempt),
feature(track_path)
feature(proc_macro_tracked_path, proc_macro_tracked_env)
)]

#[cfg(any(sqlx_macros_unstable, procmacro2_semver_exempt))]
extern crate proc_macro;

use cfg_if::cfg_if;
use std::path::PathBuf;

Expand Down Expand Up @@ -96,7 +99,7 @@ pub fn env_opt(var: &str) -> Result<Option<String>> {
use std::env::VarError;

#[cfg(any(sqlx_macros_unstable, procmacro2_semver_exempt))]
let res: Result<String, VarError> = proc_macro::tracked_env::var(var);
let res: Result<String, VarError> = proc_macro::tracked::env_var(var);

#[cfg(not(any(sqlx_macros_unstable, procmacro2_semver_exempt)))]
let res: Result<String, VarError> = std::env::var(var);
Expand Down
5 changes: 1 addition & 4 deletions sqlx-macros-core/src/migrate.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#[cfg(any(sqlx_macros_unstable, procmacro2_semver_exempt))]
extern crate proc_macro;

use std::path::{Path, PathBuf};

use proc_macro2::{Span, TokenStream};
Expand Down Expand Up @@ -132,7 +129,7 @@ pub fn expand_with_path(config: &Config, path: &Path) -> crate::Result<TokenStre
)
})?;

proc_macro::tracked_path::path(path);
proc_macro::tracked::path(path);
}

Ok(quote! {
Expand Down
2 changes: 1 addition & 1 deletion sqlx-macros-core/src/query/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl MtimeCacheBuilder {

#[cfg(any(sqlx_macros_unstable, procmacro2_semver_exempt))]
{
proc_macro::tracked_path::path(&path);
proc_macro::tracked::path(&path);
}

self.file_mtimes.push((path, mtime));
Expand Down
Loading