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.

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

Cleanup src tree #288

Merged
merged 11 commits into from
Feb 27, 2020
Merged

Conversation

restingbull
Copy link
Collaborator

No description provided.

@restingbull
Copy link
Collaborator Author

@googlebot I consent

@@ -69,7 +67,7 @@ class CompilationTaskContext(val info: CompilationTaskInfo, private val out: Pri
out.println()
}

inline fun <T> whenTracing(block: CompilationTaskContext.() -> T): T? {
fun <T> whenTracing(block: CompilationTaskContext.() -> T): T? {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Heh. This is where you ran into all those issues with the inline null, right?

Another way around it might have been to have a non-inlined function "nullify()" which returns null, which you call here. That way if it's inlined, the function call is inlined, not the bare "null".

But honestly, I don't think you're saving much by maintaining inlining, so this is fine.

javaHome,
listOf(
kotlinCompilerJar,
BazelRunFiles.resolveVerified(
Copy link
Collaborator

Choose a reason for hiding this comment

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

Subtle change.

@cgruber
Copy link
Collaborator

cgruber commented Feb 27, 2020

This all looks great to me. Feel free to merge at your leisure.

@restingbull restingbull merged commit ffcd2b2 into bazelbuild:master Feb 27, 2020
@restingbull restingbull deleted the cleanup-src-tree branch February 27, 2020 15:17
cromwellian pushed a commit to cromwellian/rules_kotlin that referenced this pull request Mar 7, 2020
* Move CompilationTaskContext to toolchain, as it doesn't really belong in utils.

* Move KotlinCompilerPluginArgsEncoder to toolchain. Temporary placement, new location TBD

* Isolate the utils package

* Move toolchain into a separate compilation unit. Causes some issues with inlining.

* Split apart test packages.

* Split apart test packages.

* Split apart test packages.

* add bazel version for development

* factor out JvmCompilationTask extensions to reuse in abi generation

* move compiler to source package. add .bazelversion for development
cgruber added a commit to cgruber/rules_kotlin that referenced this pull request Apr 14, 2020
* upstream/master:
  Fix non-reproducible archives (bazelbuild#304)
  Adds a kt_plugin rule (bazelbuild#308)
  Ensure that KotlionBuilder workers use a clean directory for each compilation. (bazelbuild#298)
  Apply autoformatting to all files. (bazelbuild#302)
  Optional outputs (bazelbuild#291)
  Change plugins to use depsets, as opposed to lists. (bazelbuild#292)
  Add Corbin to the codeowners. (bazelbuild#293)
  Update Protobuf to 3.11.3 (bazelbuild#286)
  Remove tree artifacts (bazelbuild#287)
  Cleanup src tree (bazelbuild#288)
  Update README.md (bazelbuild#285)
  Filter non-kotlin code out of generated sources (bazelbuild#263)
  Update readme so the dev instructions highlight using a local clone (bazelbuild#283)
  Remove third_party checked in jars, and properly pull maven dependencies. (bazelbuild#279)
  Only propagate srcjar if it isn't the default empty jar added in ae70089 to fix bazelbuild/intellij#1616 (bazelbuild#276)
  Allow resources to be in a kotlin directory (bazelbuild#268)
jongerrish added a commit to jongerrish/rules_kotlin that referenced this pull request Apr 16, 2020
* Move CompilationTaskContext to toolchain, as it doesn't really belong in utils.

* Move KotlinCompilerPluginArgsEncoder to toolchain. Temporary placement, new location TBD

* Isolate the utils package

* Move toolchain into a separate compilation unit. Causes some issues with inlining.

* Split apart test packages.

* Split apart test packages.

* Split apart test packages.

* add bazel version for development

* factor out JvmCompilationTask extensions to reuse in abi generation

* move compiler to source package. add .bazelversion for development
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants