Skip to content

Conversation

compiler-errors
Copy link
Member

Fixes #115618

@rustbot
Copy link
Collaborator

rustbot commented Sep 7, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 7, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the dont-suggest-use-btw-use-and-attr branch from db876d1 to 84e8b3f Compare September 7, 2023 05:15
@rust-cloud-vms rust-cloud-vms bot force-pushed the dont-suggest-use-btw-use-and-attr branch from 84e8b3f to 03bee1f Compare September 7, 2023 05:19
@wesleywiser
Copy link
Member

Thanks @compiler-errors! 🎉

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 8, 2023

📌 Commit 03bee1f has been approved by wesleywiser

It is now in the queue for this repository.

@bors 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 Sep 8, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 8, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#113807 (Tests crash from inappropriate use of common linkage)
 - rust-lang#115358 (debuginfo: add compiler option to allow compressed debuginfo sections)
 - rust-lang#115630 (Dont suggest use between `use` and cfg attr)
 - rust-lang#115662 (Improve "associated type not found" diagnostics)
 - rust-lang#115673 (Fix sanitize/cfg.rs test)

r? `@ghost`
`@rustbot` modify labels: rollup
Comment on lines -2756 to +2762
return Some(item.span.shrink_to_lo());
let mut lo = item.span.lo();
for attr in &item.attrs {
if attr.span.eq_ctxt(item.span) {
lo = std::cmp::min(lo, attr.span.lo());
}
}
return Some(Span::new(lo, lo, item.span.ctxt(), item.span.parent()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this use item.span_with_attributes().lo()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't know we even had that.

@bors bors merged commit b33ac52 into rust-lang:master Sep 9, 2023
@rustbot rustbot added this to the 1.74.0 milestone Sep 9, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2023
Rollup merge of rust-lang#115630 - compiler-errors:dont-suggest-use-btw-use-and-attr, r=wesleywiser

Dont suggest use between `use` and cfg attr

Fixes rust-lang#115618
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Import suggestion breaks #[cfg] attribute for previous imports
5 participants