From f96c1a0414ee302fe96503d89f2998483345c8a9 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 1 Jun 2021 13:39:19 +0200 Subject: Implement per-edition preludes --- crates/ide_db/src/helpers/famous_defs_fixture.rs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'crates/ide_db') diff --git a/crates/ide_db/src/helpers/famous_defs_fixture.rs b/crates/ide_db/src/helpers/famous_defs_fixture.rs index 29ae12dcf..312851966 100644 --- a/crates/ide_db/src/helpers/famous_defs_fixture.rs +++ b/crates/ide_db/src/helpers/famous_defs_fixture.rs @@ -128,17 +128,19 @@ pub mod option { } pub mod prelude { - pub use crate::{ - cmp::Ord, - convert::{From, Into}, - default::Default, - iter::{IntoIterator, Iterator}, - ops::{Fn, FnMut, FnOnce}, - option::Option::{self, *}, - }; + pub mod rust_2018 { + pub use crate::{ + cmp::Ord, + convert::{From, Into}, + default::Default, + iter::{IntoIterator, Iterator}, + ops::{Fn, FnMut, FnOnce}, + option::Option::{self, *}, + }; + } } #[prelude_import] -pub use prelude::*; +pub use prelude::rust_2018::*; //- /libstd.rs crate:std deps:core //! Signatures of traits, types and functions from the std lib for use in tests. @@ -148,4 +150,4 @@ mod return_keyword {} /// Docs for prim_str mod prim_str {} -pub use core::ops; \ No newline at end of file +pub use core::ops; -- cgit v1.2.3