Update stdlib to the 2021 edition #92030

rukai · 2021-12-17T11:00:07Z

progress towards #88638

I couldnt find a way to run the 2018 style panic tests against 2018 so I just deleted them, maybe theres a way to do it that I missed though?

rust-highfive · 2021-12-17T11:00:10Z

r? @kennytm

(rust-highfive has picked a reviewer for you, use r? to override)

rukai · 2021-12-17T11:40:02Z

Oh, seeing as theres a whole lint against it, maybe this needs more ceremony then some random person coming along and bumping to 2021.

rust/src/tools/tidy/src/edition.rs

Lines 26 to 35 in f410bc7

    
           // Library crates are not yet ready to migrate to 2021. 
        
           if path.components().any(|c| c.as_os_str() == "library") { 
        
               let has = contents.lines().any(is_edition_2018); 
        
               if !has { 
        
                   tidy_error!( 
        
                       bad, 
        
                       "{} doesn't have `edition = \"2018\"` on a separate line", 
        
                       file.display() 
        
                   ); 
        
               }

jyn514 · 2021-12-17T11:52:46Z

@m-ou-se do you happen to know why there's a lint against upgrading libstd to 2021?

@rukai please don't just delete the tests completely - you should be able to tell rustdoc to run them with an old edition using the edition2018 language string.

jyn514 · 2021-12-17T11:54:41Z

Oh hmm, those are unit tests, not doctests - I'm not sure how to make them use a different edition :/ maybe they need to be UI tests instead so they're in a separate crate?

rukai · 2021-12-17T12:11:19Z

ah, replacing them with ui tests makes sense!
I'll do that.

jyn514 · 2021-12-17T12:20:42Z

Hmm, this looks related to macro spans? Not sure what the bugs @Mark-Simulacrum referred to were.

#89103:

It excludes a migration of the library crates for now (see tidy diff) because we have some pending bugs around macro spans to fix there.

m-ou-se · 2021-12-17T12:32:41Z

ah, replacing them with ui tests makes sense! I'll do that.

There's no need for that. You can still panic with arbitrary payloads in Rust 2021. You just need to use panic_any instead of the panic (or assert) macro.

m-ou-se · 2021-12-17T12:36:50Z

library/std/src/fs/tests.rs

            Err(ref err) => assert!(
                err.raw_os_error() == Some($s),
+                "{}",
                format!("`{}` did not have a code of `{}`", err, $s)
            ),


No need to use format!() to format the argument to a format string. So instead of adding "{}", just remove the format!() macro:

Suggested change

Err(ref err) => assert!(

err.raw_os_error() == Some($s),

"{}",

format!("`{}` did not have a code of `{}`", err, $s)

),

Err(ref err) => assert!(err.raw_os_error() == Some($s), "`{}` did not have a code of `{}`", err, $s),

m-ou-se · 2021-12-17T12:36:57Z

library/std/src/fs/tests.rs

            Err(ref err) => {
-                assert!(err.to_string().contains($s), format!("`{}` did not contain `{}`", err, $s))
+                assert!(
+                    err.to_string().contains($s),
+                    "{}",
+                    format!("`{}` did not contain `{}`", err, $s)
+                )


m-ou-se · 2021-12-17T12:37:40Z

library/std/src/thread/tests.rs

-    match thread::spawn(move || {
-        panic!("owned string".to_string());
-    })


There's no need to remove these tests. Just replace panic!() by panic_any().

m-ou-se · 2021-12-17T12:52:49Z

@m-ou-se do you happen to know why there's a lint against upgrading libstd to 2021?

That lint was originally checking that everything is using Rust 2018 rather than 2015. For most of the crates it's been changed to check for 2021 instead. So it's not meant as a lint against upgrading, more a lint against not using 2015. We can change it to accept either 2018 or 2021 for now, or to require 2021 for std specifically as well.

rukai · 2021-12-17T13:06:15Z

Thanks for the feedback!
Should be all addressed now.
I opted to special case std in the lint so that we remember to remove the lint when everything is moved to 2021.

m-ou-se · 2021-12-17T13:14:51Z

src/tools/tidy/src/edition.rs

@@ -24,7 +24,10 @@ pub fn check(path: &Path, bad: &mut bool) {
            }

            // Library crates are not yet ready to migrate to 2021.
-            if path.components().any(|c| c.as_os_str() == "library") {
+            // TOOD: Once all library crates are migrated to 2021 then simplify the check to always check for 2021


There's a typo in TODO.

(Maybe just say 'Not all library crate are ..' in the existing comment? We're force to update this anyway when another library crate moves to 2021, so it's not like we can forget anything here.)

m-ou-se · 2021-12-17T14:13:20Z

@bors r+

bors · 2021-12-17T14:13:22Z

📌 Commit b656384 has been approved by m-ou-se

Update stdlib to the 2021 edition progress towards rust-lang#88638 I couldnt find a way to run the 2018 style panic tests against 2018 so I just deleted them, maybe theres a way to do it that I missed though?

…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#91439 (Mark defaulted `PartialEq`/`PartialOrd` methods as const) - rust-lang#91516 (Improve suggestion to change struct field to &mut) - rust-lang#91896 (Remove `in_band_lifetimes` for `rustc_passes`) - rust-lang#91909 (:arrow_up: rust-analyzer) - rust-lang#91922 (Remove `in_band_lifetimes` from `rustc_mir_dataflow`) - rust-lang#92025 (Revert "socket ancillary data implementation for dragonflybsd.") - rust-lang#92030 (Update stdlib to the 2021 edition) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned kennytm Dec 17, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2021

rukai force-pushed the stdlib2021 branch from 016ab9e to e02210f Compare December 17, 2021 11:20

This comment has been minimized.

Sign in to view

m-ou-se requested changes Dec 17, 2021

View reviewed changes

rukai force-pushed the stdlib2021 branch from e02210f to 4b39064 Compare December 17, 2021 12:49

This comment has been minimized.

Sign in to view

rukai force-pushed the stdlib2021 branch from 4b39064 to e9f1764 Compare December 17, 2021 13:04

m-ou-se assigned m-ou-se and unassigned kennytm Dec 17, 2021

m-ou-se added A-edition-2021 Area: The 2021 edition C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Dec 17, 2021

rukai force-pushed the stdlib2021 branch from e9f1764 to c99e690 Compare December 17, 2021 13:08

m-ou-se reviewed Dec 17, 2021

View reviewed changes

m-ou-se mentioned this pull request Dec 17, 2021

Switch library to Rust 2021 #88638

Closed

Update stdlib to the 2021 edition

b656384

rukai force-pushed the stdlib2021 branch from c99e690 to b656384 Compare December 17, 2021 13:22

m-ou-se approved these changes Dec 17, 2021

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2021

matthiaskrgr mentioned this pull request Dec 18, 2021

Rollup of 7 pull requests #92053

Closed

This was referenced Dec 18, 2021

Rollup of 7 pull requests #92060

Closed

Rollup of 7 pull requests #92062

Merged

bors merged commit efbefb6 into rust-lang:master Dec 18, 2021

rustbot added this to the 1.59.0 milestone Dec 18, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update stdlib to the 2021 edition #92030

Update stdlib to the 2021 edition #92030

rukai commented Dec 17, 2021

rust-highfive commented Dec 17, 2021

This comment has been minimized.

rukai commented Dec 17, 2021

jyn514 commented Dec 17, 2021

jyn514 commented Dec 17, 2021

rukai commented Dec 17, 2021

jyn514 commented Dec 17, 2021

m-ou-se commented Dec 17, 2021

m-ou-se Dec 17, 2021

m-ou-se Dec 17, 2021

m-ou-se Dec 17, 2021

m-ou-se commented Dec 17, 2021

This comment has been minimized.

rukai commented Dec 17, 2021 •

edited

Loading

m-ou-se Dec 17, 2021

m-ou-se commented Dec 17, 2021

bors commented Dec 17, 2021

Update stdlib to the 2021 edition #92030

Update stdlib to the 2021 edition #92030

Conversation

rukai commented Dec 17, 2021

rust-highfive commented Dec 17, 2021

This comment has been minimized.

rukai commented Dec 17, 2021

jyn514 commented Dec 17, 2021

jyn514 commented Dec 17, 2021

rukai commented Dec 17, 2021

jyn514 commented Dec 17, 2021

m-ou-se commented Dec 17, 2021

m-ou-se Dec 17, 2021

Choose a reason for hiding this comment

m-ou-se Dec 17, 2021

Choose a reason for hiding this comment

m-ou-se Dec 17, 2021

Choose a reason for hiding this comment

m-ou-se commented Dec 17, 2021

This comment has been minimized.

rukai commented Dec 17, 2021 • edited Loading

m-ou-se Dec 17, 2021

Choose a reason for hiding this comment

m-ou-se commented Dec 17, 2021

bors commented Dec 17, 2021

rukai commented Dec 17, 2021 •

edited

Loading