Skip to content

Commit b835f06

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 503-hover-doc-links
2 parents 452afae + ef9cea9 commit b835f06

File tree

46 files changed

+959
-835
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+959
-835
lines changed

.github/workflows/publish.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: publish
2+
on:
3+
workflow_dispatch: # We can add version input when 1.0 is released and scheduled releases are removed
4+
5+
schedule:
6+
- cron: "0 0 * * *" # midnight UTC
7+
8+
push:
9+
branches:
10+
- release
11+
12+
jobs:
13+
publish:
14+
name: publish
15+
runs-on: ubuntu-16.04
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v2
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Install Rust toolchain
23+
uses: actions-rs/toolchain@v1
24+
with:
25+
toolchain: stable
26+
profile: minimal
27+
override: true
28+
29+
- name: Install cargo-workspaces
30+
uses: actions-rs/install@v0.1
31+
with:
32+
crate: cargo-workspaces
33+
34+
- name: Release
35+
env:
36+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
37+
PATCH: ${{ github.run_number }}
38+
shell: bash
39+
run: |
40+
git config --global user.email "runner@gha.local"
41+
git config --global user.name "Github Action"
42+
rm Cargo.lock
43+
cargo workspaces rename ra_ap_%n
44+
cargo workspaces publish --yes --force '*' --exact --no-git-commit --allow-dirty --skip-published custom 0.0.$PATCH

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/arena/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "arena"
33
version = "0.0.0"
4+
description = "TBD"
45
license = "MIT OR Apache-2.0"
56
authors = ["rust-analyzer developers"]
67
edition = "2018"

crates/assists/Cargo.toml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "assists"
33
version = "0.0.0"
4+
description = "TBD"
45
license = "MIT OR Apache-2.0"
56
authors = ["rust-analyzer developers"]
67
edition = "2018"
@@ -13,11 +14,11 @@ rustc-hash = "1.1.0"
1314
itertools = "0.9.0"
1415
either = "1.5.3"
1516

16-
stdx = { path = "../stdx" }
17-
syntax = { path = "../syntax" }
18-
text_edit = { path = "../text_edit" }
19-
profile = { path = "../profile" }
20-
base_db = { path = "../base_db" }
21-
ide_db = { path = "../ide_db" }
22-
hir = { path = "../hir" }
23-
test_utils = { path = "../test_utils" }
17+
stdx = { path = "../stdx", version = "0.0.0" }
18+
syntax = { path = "../syntax", version = "0.0.0" }
19+
text_edit = { path = "../text_edit", version = "0.0.0" }
20+
profile = { path = "../profile", version = "0.0.0" }
21+
base_db = { path = "../base_db", version = "0.0.0" }
22+
ide_db = { path = "../ide_db", version = "0.0.0" }
23+
hir = { path = "../hir", version = "0.0.0" }
24+
test_utils = { path = "../test_utils", version = "0.0.0" }

crates/assists/src/assist_context.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ impl<'a> AssistContext<'a> {
7373
self.sema.db
7474
}
7575

76-
pub(crate) fn source_file(&self) -> &SourceFile {
77-
&self.source_file
78-
}
79-
8076
// NB, this ignores active selection.
8177
pub(crate) fn offset(&self) -> TextSize {
8278
self.frange.range.start()

0 commit comments

Comments
 (0)