Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Jul 26, 2020
Merged

Use the proper span when WF-checking an impl self type #74735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions src/librustc_trait_selection/traits/wf.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
trait_ref
.substs
.iter()
.filter(|arg| {
.enumerate()
.filter(|(_, arg)| {
matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
})
.filter(|arg| !arg.has_escaping_bound_vars())
.map(|arg| {
.filter(|(_, arg)| !arg.has_escaping_bound_vars())
.map(|(i, arg)| {
let mut new_cause = cause.clone();
// The first subst is the self ty - use the correct span for it.
if i == 0 {
if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
new_cause.make_mut().span = self_ty.span;
}
}
traits::Obligation::new(
cause.clone(),
new_cause,
param_env,
ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
)
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
--> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
--> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
|
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
| ------------- ---- ...because method `eq` references the `Self` type in this parameter
| |
| this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
| ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
| ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
|
= help: consider moving `eq` to another trait

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
= help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
--> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
--> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
|
LL | trait NonObjectSafe1: Sized {}
| -------------- ----- ...because it requires `Self: Sized`
| |
| this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
| ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
| ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/issues/issue-21837.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
--> $DIR/issue-21837.rs:8:9
--> $DIR/issue-21837.rs:8:20
|
LL | pub struct Foo<T: Bound>(T);
| ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
| ^^^^^^ the trait `Bound` is not implemented for `T`
| ^^^^^^ the trait `Bound` is not implemented for `T`
|
help: consider restricting type parameter `T`
|
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/unsized/unsized-trait-impl-self-type.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
--> $DIR/unsized-trait-impl-self-type.rs:10:17
--> $DIR/unsized-trait-impl-self-type.rs:10:27
|
LL | struct S5<Y>(Y);
| - required by this bound in `S5`
LL |
LL | impl<X: ?Sized> T3<X> for S5<X> {
| - ^^^^^ doesn't have a size known at compile-time
| - ^^^^^ doesn't have a size known at compile-time
| |
| this type parameter needs to be `std::marker::Sized`
|
Expand Down
7 changes: 7 additions & 0 deletions src/test/ui/wf/wf-impl-self-type.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}
16 changes: 16 additions & 0 deletions src/test/ui/wf/wf-impl-self-type.stderr
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
--> $DIR/wf-impl-self-type.rs:5:14
|
LL | impl Foo for Option<[u8]> {}
| ^^^^^^^^^^^^ doesn't have a size known at compile-time
|
::: $SRC_DIR/libcore/option.rs:LL:COL
|
LL | pub enum Option<T> {
| - required by this bound in `std::option::Option`
|
= help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Use the proper span when WF-checking an impl self type#74735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

bors
merged 1 commit into

from

Jul 26, 2020
 Merged


Use the proper span when WF-checking an impl self type
#74735
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


16 changes: 12 additions & 4 deletions
src/librustc_trait_selection/traits/wf.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -300,13 +300,21 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
 trait_ref
 .substs
 .iter()
 .filter(|arg| {
 .enumerate()
 .filter(|(_, arg)| {
 matches!(arg.unpack(), GenericArgKind::Type(..) | GenericArgKind::Const(..))
 })
 .filter(|arg| !arg.has_escaping_bound_vars())
 .map(|arg| {
 .filter(|(_, arg)| !arg.has_escaping_bound_vars())
 .map(|(i, arg)| {
 let mut new_cause = cause.clone();
 // The first subst is the self ty - use the correct span for it.
 if i == 0 {
 if let Some(hir::ItemKind::Impl { self_ty, .. }) = item.map(|i| &i.kind) {
 new_cause.make_mut().span = self_ty.span;
 }
 }
 traits::Obligation::new(
cause.clone(),
new_cause,
 param_env,
 ty::PredicateKind::WellFormed(arg).to_predicate(tcx),
 )
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
error[E0038]: the trait `NotObjectSafe` cannot be made into an object
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
 --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:24
 |
LL | trait NotObjectSafe { fn eq(&self, other: Self); }
 | ------------- ---- ...because method `eq` references the `Self` type in this parameter
 | |
 | this trait cannot be made into an object...
LL | impl NotObjectSafe for dyn NotObjectSafe { }
 | ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
 |
 = help: consider moving `eq` to another trait

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,15 +52,15 @@ LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
 = help: consider moving `foo` to another trait

error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
 --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:16
 |
LL | trait NonObjectSafe1: Sized {}
 | -------------- ----- ...because it requires `Self: Sized`
 | |
 | this trait cannot be made into an object...
...
LL | impl Trait for dyn NonObjectSafe1 {}
 | ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 |  ^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object

error: aborting due to 5 previous errors

Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/issues/issue-21837.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the trait bound `T: Bound` is not satisfied
 --> $DIR/issue-21837.rs:8:9
 --> $DIR/issue-21837.rs:8:20
 |
LL | pub struct Foo<T: Bound>(T);
 | ----- required by this bound in `Foo`
...
LL | impl<T> Trait2 for Foo<T> {}
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 | ^^^^^^ the trait `Bound` is not implemented for `T`
 |
help: consider restricting type parameter `T`
 |
Expand Down

4 changes: 2 additions & 2 deletions
src/test/ui/unsized/unsized-trait-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
error[E0277]: the size for values of type `X` cannot be known at compilation time
 --> $DIR/unsized-trait-impl-self-type.rs:10:17
 --> $DIR/unsized-trait-impl-self-type.rs:10:27
 |
LL | struct S5<Y>(Y);
 | - required by this bound in `S5`
LL | 
LL | impl<X: ?Sized> T3<X> for S5<X> {
 | - ^^^^^ doesn't have a size known at compile-time
 | - ^^^^^ doesn't have a size known at compile-time
 | |
 | this type parameter needs to be `std::marker::Sized`
 |
Expand Down

7 changes: 7 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// Tests that we point at the proper location for an error
// involving the self-type of an impl

trait Foo {}
impl Foo for Option<[u8]> {} //~ ERROR the size for

fn main() {}

16 changes: 16 additions & 0 deletions
src/test/ui/wf/wf-impl-self-type.stderr

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
 --> $DIR/wf-impl-self-type.rs:5:14
 |
LL | impl Foo for Option<[u8]> {}
 | ^^^^^^^^^^^^ doesn't have a size known at compile-time
 | 
 ::: $SRC_DIR/libcore/option.rs:LL:COL
 |
LL | pub enum Option<T> {
 | - required by this bound in `std::option::Option`
 |
 = help: the trait `std::marker::Sized` is not implemented for `[u8]`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.