Skip to content
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

Jump to bottom

Rollup of 7 pull requests #116492

Merged
merged 25 commits into from
Oct 6, 2023
Merged

Rollup of 7 pull requests #116492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift click to select a range
13e5875
add some docs to hooks/mod.rs
RalfJung Sep 30, 2023
23efab4
Fix typo in attrs.rs
eltociear Oct 4, 2023
80bf688
Remove an unnecessary `pub(crate)`.
nnethercote Oct 5, 2023
4091936
Make the comment order match variant declaration order.
nnethercote Oct 5, 2023
449b84c
Remove `map_layouts`.
nnethercote Oct 6, 2023
73420fc
Fix a comment.
nnethercote Oct 6, 2023
29ed8e4
Remove the `MaybeTransmutableQuery<&'l Dfa<...>, C>` impl.
nnethercote Oct 6, 2023
442a66d
Remove unneeded dependency.
nnethercote Oct 3, 2023
108e541
Remove unused `FileName::CfgSpec`.
nnethercote Oct 4, 2023
e49a147
Factor out `insert_or_error`.
nnethercote Oct 4, 2023
4b51a3e
Remove unneeded dependency.
nnethercote Oct 6, 2023
093b435
Remove unneeded features.
nnethercote Oct 6, 2023
e7dabc9
Remove unnecessary `pub`.
nnethercote Oct 6, 2023
b80e653
Attempt to describe the intent behind the `From` trait further
scottmcm Aug 6, 2023
44f92c1
Don't mention "recover the original" in `From` docs
scottmcm Oct 6, 2023
1651f1f
Elaborate some caveats to lossless
scottmcm Oct 6, 2023
5432d13
Reuse existing `Some`s in `Option::(x)or`
scottmcm Oct 6, 2023
c95015c
Minor doc clarification in Once::call_once
peterjoel Oct 6, 2023
4dfa5e5
Rollup merge of #114564 - scottmcm:when-to-from, r=dtolnay
matthiaskrgr Oct 6, 2023
fdb136a
Rollup merge of #116297 - RalfJung:hooks, r=oli-obk
matthiaskrgr Oct 6, 2023
81192f2
Rollup merge of #116423 - eltociear:patch-22, r=flip1995
matthiaskrgr Oct 6, 2023
25fbd13
Rollup merge of #116466 - nnethercote:rustc_transmute, r=oli-obk
matthiaskrgr Oct 6, 2023
9796dfd
Rollup merge of #116474 - nnethercote:rustc_assorted, r=spastorino
matthiaskrgr Oct 6, 2023
f8dae0c
Rollup merge of #116481 - scottmcm:tweak-combinators, r=cuviper
matthiaskrgr Oct 6, 2023
7f0cf8c
Rollup merge of #116484 - peterjoel:once-doc-clarify, r=cuviper
matthiaskrgr Oct 6, 2023
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
Prev Previous commit
Next Next commit
Remove unused FileName::CfgSpec.
  • Loading branch information
@nnethercote
nnethercote committed Oct 6, 2023
commit 108e541cc2d73fc4548847a2cfddca5c3b3499e6
1 change: 0 additions & 1 deletion compiler/rustc_session/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 813,6 @@ impl Input {
FileName::Anon(_) => None,
FileName::MacroExpansion(_) => None,
FileName::ProcMacroSourceCode(_) => None,
FileName::CfgSpec(_) => None,
FileName::CliCrateAttr(_) => None,
FileName::Custom(_) => None,
FileName::DocTest(path, _) => Some(path),
Expand Down
7 changes: 1 addition & 6 deletions compiler/rustc_span/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 280,7 @@ impl RealFileName {
}

/// Differentiates between real files and common virtual files.
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash)]
#[derive(Decodable, Encodable)]
#[derive(Debug, Eq, PartialEq, Clone, Ord, PartialOrd, Hash, Decodable, Encodable)]
pub enum FileName {
Real(RealFileName),
/// Call to `quote!`.
Expand All @@ -292,8 291,6 @@ pub enum FileName {
// FIXME(jseyfried)
MacroExpansion(Hash64),
ProcMacroSourceCode(Hash64),
/// Strings provided as `--cfg [cfgspec]` stored in a `crate_cfg`.
CfgSpec(Hash64),
/// Strings provided as crate attributes in the CLI.
CliCrateAttr(Hash64),
/// Custom sources for explicit parser calls from plugins and drivers.
Expand Down Expand Up @@ -339,7 336,6 @@ impl fmt::Display for FileNameDisplay<'_> {
MacroExpansion(_) => write!(fmt, "<macro expansion>"),
Anon(_) => write!(fmt, "<anon>"),
ProcMacroSourceCode(_) => write!(fmt, "<proc-macro source code>"),
CfgSpec(_) => write!(fmt, "<cfgspec>"),
CliCrateAttr(_) => write!(fmt, "<crate attribute>"),
Custom(ref s) => write!(fmt, "<{s}>"),
DocTest(ref path, _) => write!(fmt, "{}", path.display()),
Expand All @@ -365,7 361,6 @@ impl FileName {
Anon(_)
| MacroExpansion(_)
| ProcMacroSourceCode(_)
| CfgSpec(_)
| CliCrateAttr(_)
| Custom(_)
| QuoteExpansion(_)
Expand Down