Skip to content

Commit 1aa834b

Browse files
committed
Upgrade toolchain & adapt to tracked_path changes
- tracked_path was renamed Ref: rust-lang/rust#149400
1 parent 63196b8 commit 1aa834b

6 files changed

Lines changed: 34 additions & 33 deletions

File tree

flake.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@
8181
++ buildInputs;
8282

8383
buildInputs = buildInputs;
84+
LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath buildInputs}";
85+
MALLOC_CONF="thp:always,metadata_thp:always";
8486
shellHook = ''
85-
export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath buildInputs}"
86-
export MALLOC_CONF=thp:always,metadata_thp:always
8787
'';
8888
};
8989
});

rust-toolchain.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2025-05-25"
2+
channel = "nightly-2025-12-20"
33
components = [
44
"cargo",
55
"rust-analyzer",
@@ -10,7 +10,8 @@ components = [
1010
]
1111
profile = "default"
1212
targets = [
13-
"wasm32-unknown-unknown",
14-
"x86_64-pc-windows-msvc",
1513
"x86_64-unknown-linux-gnu",
14+
"x86_64-unknown-linux-musl",
15+
"x86_64-pc-windows-gnu",
16+
# "wasm32-unknown-unknown",
1617
]

src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ fn main() {
163163
```
164164
*/
165165
#![forbid(unsafe_code)]
166-
#![cfg_attr(feature = "nightly", feature(track_path))]
166+
#![cfg_attr(feature = "nightly", feature(proc_macro_tracked_path))]
167167

168168
#[cfg(feature = "nightly")]
169-
use proc_macro::tracked_path;
169+
use proc_macro::tracked;
170170
use proc_macro::TokenStream;
171171
use proc_macro2::TokenStream as TokenStream2;
172172
use quote::quote;
@@ -204,7 +204,7 @@ pub fn folder_router(attr: TokenStream, item: TokenStream) -> TokenStream {
204204
"/// [folder_router] Tracking path: {:?}",
205205
args.abs_norm_path()
206206
);
207-
tracked_path::path(args.abs_norm_path().as_path().to_str().unwrap());
207+
tracked::path(args.abs_norm_path().as_path().to_str().unwrap());
208208
}
209209

210210
let item = parse_macro_input!(item as parse::FolderRouterItem);

tests/expand/advanced.expanded.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
/// [folder_router] Found route.rs for axum_path: "/users", mod_path: ["users", "route"]
1414
/// [folder_router] Found methods for axum_path: "/users", mod_path: ["users", "route"], methods: ["get", "post"]
1515
#![feature(prelude_import)]
16-
#[prelude_import]
17-
use std::prelude::rust_2021::*;
1816
#[macro_use]
1917
extern crate std;
18+
#[prelude_import]
19+
use std::prelude::rust_2021::*;
2020
use axum_folder_router::folder_router;
2121
struct AppState {
2222
_foo: String,

tests/expand/simple.expanded.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
/// [folder_router] Found route.rs for axum_path: "/", mod_path: ["route"]
44
/// [folder_router] Found methods for axum_path: "/", mod_path: ["route"], methods: ["get"]
55
#![feature(prelude_import)]
6-
#[prelude_import]
7-
use std::prelude::rust_2021::*;
86
#[macro_use]
97
extern crate std;
8+
#[prelude_import]
9+
use std::prelude::rust_2021::*;
1010
use axum_folder_router::folder_router;
1111
struct AppState;
1212
#[automatically_derived]

0 commit comments

Comments
 (0)