8000 Streamline `Compiler` by nnethercote · Pull Request #64016 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Streamline Compiler #64016

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
merged 4 commits into from
Sep 25, 2019
Merged

Streamline Compiler #64016

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d61605c
Don't call `self.parse()` in `Compiler::crate_name()` unless necessary.
nnethercote Aug 29, 2019
cd0c21b
Remove `lower_to_hir()` call from `prepare_output()`.
nnethercote Aug 30, 2019
d264a56
Move call site of `dep_graph_future()`.
nnethercote Aug 30, 2019
2521189
Add a comment to `Compiler::compile()`.
nnethercote Aug 30, 2019
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
Next Next commit
Don't call self.parse() in Compiler::crate_name() unless necessary.
  • Loading branch information
@nnethercote
nnethercote committed Sep 1, 2019
commit d61605cef866008a19e33eb596df1d76ff1571f3
21 changes: 11 additions & 10 deletions src/librustc_interface/queries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,18 @@ impl Compiler {

pub fn crate_name(&self) -> Result<&Query<String>> {
self.queries.crate_name.compute(|| {
let parse_result = self.parse()?;
let krate = parse_result.peek();
let result = match self.crate_name {
Ok(match self.crate_name {
Some(ref crate_name) => crate_name.clone(),
None => rustc_codegen_utils::link::find_crate_name(
Some(self.session()),
&krate.attrs,
&self.input
),
};
Ok(result)
None => {
let parse_result = self.parse()?;
let krate = parse_result.peek();
rustc_codegen_utils::link::find_crate_name(
Some(self.session()),
&krate.attrs,
&self.input
)
}
})
})
}

Expand Down
0