Skip to content

Commit

Permalink
Update Rust version in Dockerfile to actually work
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceManiac committed Oct 26, 2024
1 parent 63f43a1 commit 7c35935
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.54
FROM rust:1.74

WORKDIR /usr/src/myapp
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion crates/dmdoc/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ fn main2() -> Result<(), Box<dyn std::error::Error>> {
}

fn find_return_type(code: &dm::ast::Block) -> Option<Vec<String>> {
for stmt in code {
for stmt in code.iter() {
if let dm::ast::Statement::Setting { name, mode: dm::ast::SettingMode::Assign, value } = &stmt.elem {
if name.as_str() == "SpacemanDMM_return_type" {
if let Some(dm::ast::Term::Prefab(fab)) = value.as_term() {
Expand Down
4 changes: 3 additions & 1 deletion crates/dmdoc/src/template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,12 @@ fn teaser(block: &DocBlock, prefix: &str) -> Markup {
}

fn git_link(env: &Environment, file: &str, line: u32) -> Markup {
let z;
let title = if line == 0 {
file
} else {
&format!("{} {}", file, line)
z = format!("{} {}", file, line);
&z
};
let icon = html! {
img src="git.png" width="16" height="16" title=(title);
Expand Down

0 comments on commit 7c35935

Please sign in to comment.