about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-08-28 07:32:25 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2019-08-28 07:32:25 +0900
commitede7a777c08658ec54abea504da0e46cd0fb5e5b (patch)
treed280daa682976f182f43ebda63c6a8339b1ec482
parent8c921beebbc4501f301cd1830b7c2528368e517a (diff)
downloadrust-ede7a777c08658ec54abea504da0e46cd0fb5e5b.tar.gz
rust-ede7a777c08658ec54abea504da0e46cd0fb5e5b.zip
Remove `sized` spans
-rw-r--r--src/librustc_typeck/check/cast.rs2
-rw-r--r--src/librustc_typeck/check/mod.rs2
-rw-r--r--src/test/ui/lang-item-missing.stderr4
-rw-r--r--src/test/ui/privacy/privacy2.rs2
-rw-r--r--src/test/ui/privacy/privacy2.stderr4
-rw-r--r--src/test/ui/privacy/privacy3.rs2
-rw-r--r--src/test/ui/privacy/privacy3.stderr4
7 files changed, 4 insertions, 16 deletions
diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs
index 6b88144d1fc..55e7a10f1aa 100644
--- a/src/librustc_typeck/check/cast.rs
+++ b/src/librustc_typeck/check/cast.rs
@@ -649,7 +649,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
 
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     fn type_is_known_to_be_sized_modulo_regions(&self, ty: Ty<'tcx>, span: Span) -> bool {
-        let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, Some(span));
+        let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, None);
         traits::type_known_to_meet_bound_modulo_regions(self, self.param_env, ty, lang_item, span)
     }
 }
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 62e11fb421e..29fae13e6a8 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -2622,7 +2622,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                  span: Span,
                                  code: traits::ObligationCauseCode<'tcx>)
     {
-        let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, Some(span));
+        let lang_item = self.tcx.require_lang_item(lang_items::SizedTraitLangItem, None);
         self.require_type_meets(ty, span, code, lang_item);
     }
 
diff --git a/src/test/ui/lang-item-missing.stderr b/src/test/ui/lang-item-missing.stderr
index 94d62023f35..f7516c7d377 100644
--- a/src/test/ui/lang-item-missing.stderr
+++ b/src/test/ui/lang-item-missing.stderr
@@ -1,8 +1,4 @@
 error: requires `sized` lang_item
-  --> $DIR/lang-item-missing.rs:10:50
-   |
-LL | fn start(argc: isize, argv: *const *const u8) -> isize {
-   |                                                  ^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/privacy/privacy2.rs b/src/test/ui/privacy/privacy2.rs
index 07634d9132e..c8fa436bd14 100644
--- a/src/test/ui/privacy/privacy2.rs
+++ b/src/test/ui/privacy/privacy2.rs
@@ -11,7 +11,7 @@ mod bar {
     }
 }
 
-pub fn foo() {} //~ ERROR: requires `sized` lang_item
+pub fn foo() {}
 
 fn test1() {
     use bar::foo;
diff --git a/src/test/ui/privacy/privacy2.stderr b/src/test/ui/privacy/privacy2.stderr
index eaa9f1ad652..9f2359657bd 100644
--- a/src/test/ui/privacy/privacy2.stderr
+++ b/src/test/ui/privacy/privacy2.stderr
@@ -11,10 +11,6 @@ LL |     use bar::glob::foo;
    |                    ^^^
 
 error: requires `sized` lang_item
-  --> $DIR/privacy2.rs:14:14
-   |
-LL | pub fn foo() {}
-   |              ^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/privacy/privacy3.rs b/src/test/ui/privacy/privacy3.rs
index 8853700180d..5a7cd76a98f 100644
--- a/src/test/ui/privacy/privacy3.rs
+++ b/src/test/ui/privacy/privacy3.rs
@@ -8,7 +8,7 @@ mod bar {
     pub use self::glob::*;
 
     mod glob {
-        fn gpriv() {} //~ ERROR: requires `sized` lang_item
+        fn gpriv() {}
     }
 }
 
diff --git a/src/test/ui/privacy/privacy3.stderr b/src/test/ui/privacy/privacy3.stderr
index 6826fbf9df2..22c1e48b07d 100644
--- a/src/test/ui/privacy/privacy3.stderr
+++ b/src/test/ui/privacy/privacy3.stderr
@@ -5,10 +5,6 @@ LL |     use bar::gpriv;
    |         ^^^^^^^^^^ no `gpriv` in `bar`
 
 error: requires `sized` lang_item
-  --> $DIR/privacy3.rs:11:20
-   |
-LL |         fn gpriv() {}
-   |                    ^
 
 error: aborting due to 2 previous errors