Revert change to tests, remove redundant imports

serde-rs · Apr 24, 2024 · 82f4143 · 82f4143
1 parent e393bcc
commit 82f4143
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/serde/src/lib.rs b/serde/src/lib.rs
@@ -141,9 +141,9 @@ mod lib {
     pub use self::core::result;
 
     #[cfg(all(feature = "alloc", not(feature = "std")))]
-    pub use alloc::borrow::{Cow, ToOwned};
+    pub use alloc::borrow::Cow;
     #[cfg(feature = "std")]
-    pub use std::borrow::{Cow, ToOwned};
+    pub use std::borrow::Cow;
 
     #[cfg(all(feature = "alloc", not(feature = "std")))]
     pub use alloc::string::{String, ToString};

diff --git a/serde_core/src/lib.rs b/serde_core/src/lib.rs
@@ -113,9 +113,9 @@ mod lib {
     pub use std::borrow::{Cow, ToOwned};
 
     #[cfg(all(feature = "alloc", not(feature = "std")))]
-    pub use alloc::string::{String, ToString};
+    pub use alloc::string::String;
     #[cfg(feature = "std")]
-    pub use std::string::{String, ToString};
+    pub use std::string::String;
 
     #[cfg(all(feature = "alloc", not(feature = "std")))]
     pub use alloc::vec::Vec;

diff --git a/test_suite/tests/ui/remote/wrong_getter.stderr b/test_suite/tests/ui/remote/wrong_getter.stderr
@@ -10,7 +10,7 @@ error[E0308]: mismatched types
    = note: expected reference `&u8`
               found reference `&u16`
 note: function defined here
-  --> $WORKSPACE/serde_core/src/private/ser.rs
+  --> $WORKSPACE/serde/src/private/ser.rs
    |
    | pub fn constrain<T: ?Sized>(t: &T) -> &T {
    |        ^^^^^^^^^

diff --git a/test_suite/tests/ui/remote/wrong_ser.stderr b/test_suite/tests/ui/remote/wrong_ser.stderr
@@ -10,7 +10,7 @@ error[E0308]: mismatched types
   = note: expected reference `&u8`
              found reference `&u16`
 note: function defined here
- --> $WORKSPACE/serde_core/src/private/ser.rs
+ --> $WORKSPACE/serde/src/private/ser.rs
   |
   | pub fn constrain<T: ?Sized>(t: &T) -> &T {
   |        ^^^^^^^^^