Merge pull request #2388 from rust-lang/rustc-pull

tshepang · web-flow · commit 2fc03dfe093a · 2025-05-15T11:47:11.000+02:00
Rustc pull update
diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
@@ -5789,7 +5789,7 @@ The tracking issue for this feature is: [#120301]
 
 ------------------------
 
-Add the methods `from_mins`, `from_hours` and `from_days` to `Duration`.
+Add the methods `from_days` and `from_weeks` to `Duration`.
 "##,
         default_severity: Severity::Allow,
         warn_since: None,
diff --git a/crates/proc-macro-srv/src/tests/mod.rs b/crates/proc-macro-srv/src/tests/mod.rs
@@ -97,7 +97,6 @@ fn test_fn_like_macro_clone_raw_ident() {
 }
 
 #[test]
-#[cfg(not(bootstrap))]
 fn test_fn_like_fn_like_span_join() {
     assert_expand(
         "fn_like_span_join",
@@ -112,7 +111,6 @@ fn test_fn_like_fn_like_span_join() {
 }
 
 #[test]
-#[cfg(not(bootstrap))]
 fn test_fn_like_fn_like_span_ops() {
     assert_expand(
         "fn_like_span_ops",

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,6 @@ fn test_fn_like_macro_clone_raw_ident() {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`#[test]`
`100`		`-#[cfg(not(bootstrap))]`
`101`	`100`	`fn test_fn_like_fn_like_span_join() {`
`102`	`101`	`assert_expand(`
`103`	`102`	`"fn_like_span_join",`
`@@ -112,7 +111,6 @@ fn test_fn_like_fn_like_span_join() {`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`#[test]`
`115`		`-#[cfg(not(bootstrap))]`
`116`	`114`	`fn test_fn_like_fn_like_span_ops() {`
`117`	`115`	`assert_expand(`
`118`	`116`	`"fn_like_span_ops",`